Skip to content

Commit

Permalink
Version 1.25 release
Browse files Browse the repository at this point in the history
Signed-off-by: Jason Winning <jason.winning@gmail.com>
  • Loading branch information
jasonwinning committed Mar 27, 2023
1 parent a46b303 commit 7ef69cd
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 24 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>org.hypernomicon</groupId>
<artifactId>hypernomicon</artifactId>
<packaging>jar</packaging>
<version>1.24.3</version>
<version>1.25</version>
<name>Hypernomicon</name>
<url>http://hypernomicon.org</url>
<inceptionYear>2012</inceptionYear>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hypernomicon/Const.java
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public final class Const

EXT_1 = "ext1://";

public static final VersionNumber appVersion = new VersionNumber(1, 24, 3); // 1.24.3
public static final VersionNumber appVersion = new VersionNumber(1, 25); // 1.25

// This is the minimum version that the application version is able to load
public static final Map<VersionNumber, VersionNumber> appVersionToMinRecordsXMLVersion = new ImmutableMap.Builder<VersionNumber, VersionNumber>()
Expand Down
20 changes: 12 additions & 8 deletions src/main/java/org/hypernomicon/view/MainCtrlr.java
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,7 @@ else if ((newValue.doubleValue() >= maxHeight) && (stage.getWidth() >= maxWidth)
updateSelectorTab(false);
hideFindTable();
ctfOmniGoTo.setText(searchText);
HyperTab<? extends HDT_Record, ? extends HDT_Record> hyperTab = activeTab();
if (hyperTab != null) hyperTab.findWithinDesc();
findWithinDesc();
}
else
{
Expand Down Expand Up @@ -616,10 +615,7 @@ else if ((newValue.doubleValue() >= maxHeight) && (stage.getWidth() >= maxWidth)
ctfOmniGoTo.setOnAction(event ->
{
if (btnTextSearch.isSelected())
{
HyperTab<? extends HDT_Record, ? extends HDT_Record> hyperTab = activeTab();
if (hyperTab != null) hyperTab.findWithinDesc();
}
findWithinDesc();
else
recordLookup();
});
Expand Down Expand Up @@ -920,6 +916,15 @@ private void initInputHandlers()
});
}

//---------------------------------------------------------------------------
//---------------------------------------------------------------------------

private void findWithinDesc()
{
HyperTab<? extends HDT_Record, ? extends HDT_Record> hyperTab = activeTab();
if (hyperTab != null) hyperTab.findWithinDesc();
}

//---------------------------------------------------------------------------
//---------------------------------------------------------------------------

Expand Down Expand Up @@ -2908,8 +2913,7 @@ private void tfOmniGoToChange(String newValue, boolean showingMore)
{
if (btnTextSearch.isSelected())
{
HyperTab<? extends HDT_Record, ? extends HDT_Record> hyperTab = activeTab();
if (hyperTab != null) hyperTab.findWithinDesc();
findWithinDesc();
return;
}

Expand Down
14 changes: 0 additions & 14 deletions src/main/java/org/hypernomicon/view/mainText/MainTextWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.List;
import java.util.function.Predicate;

import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.commons.lang3.mutable.MutableInt;
import org.jsoup.nodes.Document;
Expand Down Expand Up @@ -261,7 +260,6 @@ else if (state == showingReadOnly)
highlighter.nextSearchResult();
}


//---------------------------------------------------------------------------
//---------------------------------------------------------------------------

Expand Down Expand Up @@ -717,20 +715,8 @@ public void save()
MainText mainText = curRecord.getMainText();

if (state == editing)
{
commit();

try
{
FileUtils.writeLines(db.getRootPath("old.html").toFile(), convertMultiLineStrToStrList(mainText.getHtml(), true));
FileUtils.writeLines(db.getRootPath("new.html").toFile(), convertMultiLineStrToStrList(html, true));
}
catch (IOException e)
{
noOp();
}
}

mainText.setHtml(html);
mainText.setDisplayItemsFromList(displayItems);
if (curRecord.getType() != hdtInvestigation) mainText.setKeyWorksFromList(keyWorks);
Expand Down

0 comments on commit 7ef69cd

Please sign in to comment.