Skip to content

Commit 595ffe1

Browse files
committed
minor stuff
1 parent 1fd53ed commit 595ffe1

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

buildAll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ jar xf ../lib/openchemlib.jar
1010
cd ..
1111
jar -cfm fxmolviewer.jar manifest_additions.txt -C ./bin .
1212
chmod 755 fxmolviewer.jar
13+
ls -al fxmolviewer.jar

buildLib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ jar xf ../lib/commons-compiler-2.7.0.jar
1010
jar xf ../lib/janino-2.7.0.jar
1111
cd ..
1212
jar -cf molviewerlib.jar -C ./bin .
13+
ls -al molviewerlib.jar

src/main/java/org/openmolecules/fx/viewer3d/V3DPopupMenu.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,23 @@ public V3DPopupMenu(V3DScene scene, V3DMolecule fxmol) {
8888
itemCopy3D.setDisable(fxmol == null);
8989
itemCopy3D.setOnAction(e -> scene.copy3D(fxmol));
9090

91-
92-
93-
MenuItem itemCopy2D = new MenuItem("As 2D-Molecule");
91+
MenuItem itemCopy2D = new MenuItem("2D-Molecule");
9492
itemCopy2D.setDisable(fxmol == null);
9593
itemCopy2D.setOnAction(e -> scene.copy2D(fxmol));
9694

97-
MenuItem itemCopyIDCode = new MenuItem("As ID-Code");
95+
MenuItem itemCopyIDCode = new MenuItem("ID-Code");
9896
itemCopyIDCode.setDisable(fxmol == null);
9997
itemCopyIDCode.setOnAction(e -> scene.copyAsIDCode(fxmol));
10098

101-
MenuItem itemCopyMolfileV2 = new MenuItem("As Molfile V2");
99+
MenuItem itemCopyMolfileV2 = new MenuItem("Molfile V2");
102100
itemCopyMolfileV2.setDisable(fxmol == null);
103101
itemCopyMolfileV2.setOnAction(e -> scene.copyAsMolfileV2(fxmol));
104102

105-
MenuItem itemCopyMolfileV3 = new MenuItem("As Molfile V3");
103+
MenuItem itemCopyMolfileV3 = new MenuItem("Molfile V3");
106104
itemCopyMolfileV3.setDisable(fxmol == null);
107105
itemCopyMolfileV3.setOnAction(e -> scene.copyAsMolfileV3(fxmol));
108106

109-
MenuItem itemCopySmiles = new MenuItem("As SMILES");
107+
MenuItem itemCopySmiles = new MenuItem("SMILES");
110108
itemCopySmiles.setDisable(fxmol == null);
111109
itemCopySmiles.setOnAction(e -> scene.copyAsSmiles(fxmol));
112110

@@ -148,31 +146,31 @@ public V3DPopupMenu(V3DScene scene, V3DMolecule fxmol) {
148146
getItems().add(new SeparatorMenuItem());
149147
}
150148
else {
151-
MenuItem itemCopy3D = new MenuItem("As 3D-Molecule");
149+
MenuItem itemCopy3D = new MenuItem("3D-Molecule");
152150
itemCopy3D.setDisable(fxmol == null);
153151
itemCopy3D.setOnAction(e -> scene.copy3D(fxmol));
154152

155-
MenuItem itemCopy2D = new MenuItem("As 2D-Molecule");
153+
MenuItem itemCopy2D = new MenuItem("2D-Molecule");
156154
itemCopy2D.setDisable(fxmol == null);
157155
itemCopy2D.setOnAction(e -> scene.copy2D(fxmol));
158156

159-
MenuItem itemCopyIDCode = new MenuItem("As ID-Code");
157+
MenuItem itemCopyIDCode = new MenuItem("ID-Code");
160158
itemCopyIDCode.setDisable(fxmol == null);
161159
itemCopyIDCode.setOnAction(e -> scene.copyAsIDCode(fxmol));
162160

163-
MenuItem itemCopyMolfileV2 = new MenuItem("As Molfile V2");
161+
MenuItem itemCopyMolfileV2 = new MenuItem("Molfile V2");
164162
itemCopyMolfileV2.setDisable(fxmol == null);
165163
itemCopyMolfileV2.setOnAction(e -> scene.copyAsMolfileV2(fxmol));
166164

167-
MenuItem itemCopyMolfileV3 = new MenuItem("As Molfile V3");
165+
MenuItem itemCopyMolfileV3 = new MenuItem("Molfile V3");
168166
itemCopyMolfileV3.setDisable(fxmol == null);
169167
itemCopyMolfileV3.setOnAction(e -> scene.copyAsMolfileV3(fxmol));
170168

171-
MenuItem itemCopySmiles = new MenuItem("As SMILES");
169+
MenuItem itemCopySmiles = new MenuItem("SMILES");
172170
itemCopySmiles.setDisable(fxmol == null);
173171
itemCopySmiles.setOnAction(e -> scene.copyAsSmiles(fxmol));
174172

175-
Menu menuCopy = new Menu("Copy Molecule");
173+
Menu menuCopy = new Menu("Copy Molecule As");
176174
menuCopy.getItems().addAll(itemCopy3D, itemCopy2D, itemCopyIDCode, itemCopyMolfileV2, itemCopyMolfileV3, itemCopySmiles);
177175

178176
getItems().add(menuCopy);

0 commit comments

Comments
 (0)