Skip to content

Commit c709a12

Browse files
jcschaffclaude
andcommitted
Remove unused ScriptingPanel and make jython test-only dependency
ScriptingPanel was commented out of the tree model and unreachable from the GUI. Remove it along with SCRIPTING_NODE enum, ActiveViewID.scripting, and the GuiConstants entry. With no main source code using jython, change jython-standalone to test scope in vcell-math. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent e043544 commit c709a12

7 files changed

Lines changed: 2 additions & 272 deletions

File tree

vcell-client/src/main/java/cbit/vcell/client/desktop/biomodel/BioModelEditor.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ public class BioModelEditor extends DocumentEditor {
9595
private BioModel bioModel = null;
9696

9797
private BioModelEditorModelPanel bioModelEditorModelPanel = null;
98-
private ScriptingPanel scriptingPanel = null;
99-
10098
private BioModelEditorTreeCellRenderer bioModelEditorTreeCellRenderer = null;
10199
private BioModelEditorTreeModel bioModelEditorTreeModel = null;
102100
private BioModelPropertiesPanel bioModelPropertiesPanel = null;
@@ -909,17 +907,6 @@ protected void setRightBottomPanelOnSelection(Object[] selections) {
909907
}
910908

911909

912-
private ScriptingPanel getScriptingPanel() {
913-
if (scriptingPanel == null) {
914-
try {
915-
scriptingPanel = new ScriptingPanel();
916-
} catch (java.lang.Throwable ivjExc) {
917-
handleException(ivjExc);
918-
}
919-
}
920-
return scriptingPanel;
921-
}
922-
923910
@Override
924911
protected void treeSelectionChanged() {
925912
try {
@@ -975,8 +962,6 @@ private void setRightTopPanel(Object selectedObject, SimulationContext simulatio
975962
newTopPanel = bioModelEditorApplicationsPanel;
976963
// } else if (folderClass == DocumentEditorTreeFolderClass.DATA_NODE) {
977964
// newTopPanel = dataSymbolsPanel;
978-
} else if (folderClass == DocumentEditorTreeFolderClass.SCRIPTING_NODE) {
979-
newTopPanel = getScriptingPanel();
980965
} else if (folderClass == DocumentEditorTreeFolderClass.SPECIFICATIONS_NODE
981966
|| folderClass == DocumentEditorTreeFolderClass.PROTOCOLS_NODE
982967
|| folderClass == DocumentEditorTreeFolderClass.SIMULATIONS_NODE
@@ -1038,7 +1023,6 @@ public void setBioModel(BioModel bioModel) {
10381023
getSpeciesContextSpecPanel().setBioModel(bioModel);
10391024
getMolecularStructuresPropertiesPanel().setBioModel(bioModel);
10401025
getReactionRuleSpecPropertiesPanel().setBioModel(bioModel);
1041-
getScriptingPanel().setBioModel(bioModel);
10421026
getBioModelEditorPathwayPanel().setBioModel(bioModel);
10431027
getBioModelEditorPathwayDiagramPanel().setBioModel(bioModel);
10441028
bioModelEditorTreeModel.setBioModel(bioModel);

vcell-client/src/main/java/cbit/vcell/client/desktop/biomodel/BioModelEditorTreeModel.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,18 @@ enum RunSimulationsNodeID {
5050
new DocumentEditorTreeFolderNode(DocumentEditorTreeFolderClass.BIOMODEL_PARAMETERS_NODE, true),
5151
new DocumentEditorTreeFolderNode(DocumentEditorTreeFolderClass.PATHWAY_NODE, true),
5252
// new DocumentEditorTreeFolderNode(DocumentEditorTreeFolderClass.DATA_NODE, true),
53-
// new DocumentEditorTreeFolderNode(DocumentEditorTreeFolderClass.SCRIPTING_NODE, true),
5453
};
5554
private BioModelNode modelNode = new BioModelNode(bioModelChildFolderNodes[0], true);
5655
private BioModelNode applicationsNode = new BioModelNode(bioModelChildFolderNodes[1], true);
5756
private BioModelNode bioModelParametersNode = new BioModelNode(bioModelChildFolderNodes[2], false);
5857
private BioModelNode pathwayNode = new BioModelNode(bioModelChildFolderNodes[3], true);
59-
// private BioModelNode dataNode = new BioModelNode(bioModelChildFolderNodes[4], false);
60-
// private BioModelNode scriptingNode = new BioModelNode(bioModelChildFolderNodes[4], false);
58+
// private BioModelNode dataNode = new BioModelNode(bioModelChildFolderNodes[4], false);
6159
private BioModelNode bioModelChildNodes[] = {
6260
modelNode,
6361
applicationsNode,
6462
bioModelParametersNode,
6563
pathwayNode,
6664
// dataNode,
67-
// scriptingNode,
6865
};
6966
@Deprecated
7067
List<BioModelNode> annotationNodes = new ArrayList<BioModelNode>();

vcell-client/src/main/java/cbit/vcell/client/desktop/biomodel/DocumentEditorTreeModel.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ public enum DocumentEditorTreeFolderClass {
6868
DATA_NODE( cbit.vcell.client.constants.GuiConstants.DOCUMENT_EDITOR_FOLDERNAME_DATA),
6969
APPLICATIONS_NODE( cbit.vcell.client.constants.GuiConstants.DOCUMENT_EDITOR_FOLDERNAME_APPLICATIONS),
7070
BIOMODEL_PARAMETERS_NODE( cbit.vcell.client.constants.GuiConstants.DOCUMENT_EDITOR_FOLDERNAME_BIOMODEL_PARAMETERS),
71-
SCRIPTING_NODE( cbit.vcell.client.constants.GuiConstants.DOCUMENT_EDITOR_FOLDERNAME_SCRIPTING),
72-
7371
REACTIONS_NODE( cbit.vcell.client.constants.GuiConstants.DOCUMENT_EDITOR_FOLDERNAME_REACTIONS),
7472
REACTION_DIAGRAM_NODE( cbit.vcell.client.constants.GuiConstants.DOCUMENT_EDITOR_FOLDERNAME_DIAGRAM),
7573
STRUCTURES_NODE( cbit.vcell.client.constants.GuiConstants.DOCUMENT_EDITOR_FOLDERNAME_STRUCTURES),

vcell-client/src/main/java/cbit/vcell/client/desktop/biomodel/ScriptingPanel.java

Lines changed: 0 additions & 246 deletions
This file was deleted.

vcell-client/src/main/java/cbit/vcell/client/desktop/biomodel/SelectionManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ public static enum ActiveViewID {
2828

2929
data,
3030
applications,
31-
scripting,
32-
3331
reactions,
3432
structures,
3533
species,

vcell-core/src/main/java/cbit/vcell/client/constants/GuiConstants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public class GuiConstants {
3232
public final static String DOCUMENT_EDITOR_FOLDERNAME_DATA = "Experimental Data";
3333
public final static String DOCUMENT_EDITOR_FOLDERNAME_APPLICATIONS = "Applications";
3434
public final static String DOCUMENT_EDITOR_FOLDERNAME_BIOMODEL_PARAMETERS = "Parameters, Functions, Units, etc.";
35-
public final static String DOCUMENT_EDITOR_FOLDERNAME_SCRIPTING = "Scripting";
3635
public final static String DOCUMENT_EDITOR_FOLDERNAME_REACTIONS = "Reactions";
3736
public final static String DOCUMENT_EDITOR_FOLDERNAME_DIAGRAM = "Reaction Diagram";
3837
public final static String DOCUMENT_EDITOR_FOLDERNAME_STRUCTURES = "Structures";

vcell-math/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<groupId>org.python</groupId>
126126
<artifactId>jython-standalone</artifactId>
127127
<version>2.7.4</version>
128-
<scope>compile</scope>
128+
<scope>test</scope>
129129
</dependency>
130130
<dependency>
131131
<groupId>org.apache.commons</groupId>

0 commit comments

Comments
 (0)