krlhBlupine/iBioSim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix prefences bug

Browse source 
Update libSBOLj to 2.2.2-SNAPSHOT
This commit is contained in:
Chris Myers 2017-09-19 18:59:54 -06:00
parent 8479477b8a
commit 6f0acc51cb
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
bin/reb2sac
View file

Binary file not shown.

BIN
bin/reb2sac.mac64
View file

Binary file not shown.

2
dataModels/pom.xml
View file

@ -159,7 +159,7 @@
<dependency>
<groupId>org.sbolstandard</groupId>
<artifactId>libSBOLj</artifactId>
<version>2.2.1</version>
<version>2.2.2-SNAPSHOT</version>
</dependency>
<dependency>

8
gui/src/main/java/edu/utah/ece/async/ibiosim/gui/modelEditor/schematic/ModelEditor.java
View file

@ -145,7 +145,7 @@ import edu.utah.ece.async.ibiosim.synthesis.assembly.SequenceTypeValidator;
import edu.utah.ece.async.lema.verification.lpn.LPN;
import edu.utah.ece.async.lema.verification.lpn.Lpn2verilog;
import edu.utah.ece.async.lema.verification.lpn.Transition;
import edu.utah.ece.async.sboldesigner.sbol.editor.dialog.UploadDialog;
import edu.utah.ece.async.sboldesigner.sbol.editor.dialog.UploadNewDialog;
import edu.utah.ece.async.sboldesigner.sbol.editor.Registries;
import edu.utah.ece.async.sboldesigner.sbol.editor.Registry;;
@ -431,7 +431,9 @@ public class ModelEditor extends PanelObservable implements ActionListener, Mous
if (check) {
// saveSBOL(true);
} else {
if (Preferences.userRoot().get(GlobalConstants.CONSTRUCT_ASSEMBLY_PREFERENCE, "False").equals("True")) {
//if (Preferences.userRoot().get(GlobalConstants.CONSTRUCT_ASSEMBLY_PREFERENCE, "False").equals("True")) {
// TODO: Removed assembly for now
if (false) {
try {
saveSBOL2();
} catch (SBOLValidationException e) {
@ -712,7 +714,7 @@ public class ModelEditor extends PanelObservable implements ActionListener, Mous
}
// Show the UploadDialog
UploadDialog ud = new UploadDialog(getParent(), registry, uploadDoc);
UploadNewDialog ud = new UploadNewDialog(getParent(), registry, uploadDoc);
}
/**

6
gui/src/main/java/edu/utah/ece/async/ibiosim/gui/util/preferences/RegistryPreferencesTab.java
View file

@ -41,13 +41,11 @@ import javax.swing.table.TableRowSorter;
import org.synbiohub.frontend.SynBioHubFrontend;
import edu.utah.ece.async.ibiosim.gui.ResourceManager;
import edu.utah.ece.async.ibiosim.gui.util.preferences.PreferencesDialog.PreferencesTab;
import edu.utah.ece.async.sboldesigner.sbol.editor.Images;
import edu.utah.ece.async.sboldesigner.sbol.editor.Registries;
import edu.utah.ece.async.sboldesigner.sbol.editor.Registry;
import edu.utah.ece.async.sboldesigner.sbol.editor.SynBioHubFrontends;
import edu.utah.ece.async.sboldesigner.sbol.editor.dialog.OldInputDialog;
import edu.utah.ece.async.sboldesigner.sbol.editor.dialog.RegistryAddDialog;
import edu.utah.ece.async.sboldesigner.sbol.editor.dialog.RegistryLoginDialog;
@ -114,6 +112,9 @@ public enum RegistryPreferencesTab implements PreferencesTab {
frontends.removeFrontend(r.getLocation());
}
frontends.addFrontend(r.getLocation(), frontend);
for (SynBioHubFrontend fe : frontends.getFrontends()) {
System.out.println(fe);
}
break;
case RESTORE:
model.restoreDefaults();
@ -170,6 +171,7 @@ public enum RegistryPreferencesTab implements PreferencesTab {
}
});
// TODO: what is this for?
//OldInputDialog.setWidthAsPercentages(table, 0.2, 0.2, 0.6);
TableRowSorter<RegistryTableModel> sorter = new TableRowSorter<RegistryTableModel>(tableModel);