Menu
▾
▴
gridarta-commit
|
From: <aki...@us...> - 2013-11-23 09:26:09
|
Revision: 9487
http://sourceforge.net/p/gridarta/code/9487
Author: akirschbaum
Date: 2013-11-23 09:26:02 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Remove duplicated code.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 08:52:58 UTC (rev 9486)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 09:26:02 UTC (rev 9487)
@@ -242,7 +242,6 @@
}
});
optionsTab.add(registerButton, gbc);
- tabs.add("Options", optionsTab);
gbc.gridy = 5;
final AbstractButton exportButton = new JButton("Export script...");
exportButton.setToolTipText("Export the specified plugin as XML (for distribution)");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-11-23 09:36:46
|
Revision: 9488
http://sourceforge.net/p/gridarta/code/9488
Author: akirschbaum
Date: 2013-11-23 09:36:38 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Extract code into functions.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 09:26:02 UTC (rev 9487)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 09:36:38 UTC (rev 9488)
@@ -83,15 +83,12 @@
private final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory;
@NotNull
- private final JPanel paramTable;
+ private final JPanel paramTable = new JPanel(new GridBagLayout());
@NotNull
- private final AbstractButton removeParameter;
+ private final AbstractButton removeParameter = new JButton("Remove parameter");
@NotNull
- private final RSyntaxTextArea code;
-
- @NotNull
private final PluginModel<G, A, R> pluginModel;
@NotNull
@@ -152,13 +149,13 @@
};
@NotNull
- private final AbstractButton typeAutoRun;
+ private final AbstractButton typeAutoRun = new JCheckBox("auto-run at application startup");
@NotNull
- private final AbstractButton typeFilter;
+ private final AbstractButton typeFilter = new JCheckBox("reference in the filters list");
@NotNull
- private final AbstractButton typeBash;
+ private final AbstractButton typeBash = new JCheckBox("reference in the manual run list");
/**
* Create a visual JComponent used to edit the given script.
@@ -173,6 +170,13 @@
final JTabbedPane tabs = new JTabbedPane();
panel.setLayout(new BorderLayout());
panel.add(tabs);
+ tabs.add("Options", createOptionsTab(pluginController, resourceIcons));
+ tabs.addTab("Manual run parameters", createParameterTab());
+ tabs.addTab("Code", createCodePanel(pluginController));
+ }
+
+ @NotNull
+ private Component createOptionsTab(@NotNull final PluginController<G, A, R> pluginController, @NotNull final ResourceIcons resourceIcons) {
final Container optionsTab = new JPanel(new GridBagLayout());
final GridBagConstraints gbc = new GridBagConstraints();
gbc.fill = GridBagConstraints.HORIZONTAL;
@@ -198,7 +202,6 @@
gbc.weightx = 0.9;
gbc.fill = GridBagConstraints.NONE;
gbc.anchor = GridBagConstraints.WEST;
- typeAutoRun = new JCheckBox("auto-run at application startup");
typeAutoRun.addActionListener(new ActionListener() {
@Override
@@ -209,7 +212,6 @@
typeAutoRun.setSelected(plugin.isAutoBoot());
optionsTab.add(typeAutoRun, gbc);
gbc.gridy = 2;
- typeFilter = new JCheckBox("reference in the filters list");
typeFilter.addActionListener(new ActionListener() {
@Override
@@ -220,7 +222,6 @@
typeFilter.setSelected(plugin.isFilter());
optionsTab.add(typeFilter, gbc);
gbc.gridy = 3;
- typeBash = new JCheckBox("reference in the manual run list");
typeBash.addActionListener(new ActionListener() {
@Override
@@ -253,9 +254,12 @@
}
});
optionsTab.add(exportButton, gbc);
- tabs.add("Options", optionsTab);
+ return optionsTab;
+ }
+
+ @NotNull
+ private Component createParameterTab() {
final Container parameterTab = new JPanel(new BorderLayout());
- paramTable = new JPanel(new GridBagLayout());
redrawTable();
plugin.addChangeListener(new ChangeListener() {
@@ -266,7 +270,6 @@
});
final Component scrollPane1 = new JScrollPane(paramTable);
parameterTab.add(scrollPane1, BorderLayout.CENTER);
- //parameterTab.add(paramTable, BorderLayout.CENTER);
final Container paramButtons = new JPanel();
paramButtons.setLayout(new StackLayout(5));
final AbstractButton addParameter = new JButton("Add parameter");
@@ -277,7 +280,6 @@
plugin.newParameter();
}
});
- removeParameter = new JButton("Remove parameter");
removeParameter.addActionListener(new ActionListener() {
@Override
@@ -301,8 +303,12 @@
paramButtons.add(addParameter);
paramButtons.add(removeParameter);
parameterTab.add(paramButtons, BorderLayout.EAST);
- tabs.addTab("Manual run parameters", parameterTab);
- code = new RSyntaxTextArea();
+ return parameterTab;
+ }
+
+ @NotNull
+ private RSyntaxTextArea createCode() {
+ final RSyntaxTextArea code = new RSyntaxTextArea();
code.setText(plugin.getCode());
code.setFont(new Font("Monospaced", Font.PLAIN, 14));
code.getDocument().addDocumentListener(new DocumentListener() {
@@ -323,7 +329,12 @@
}
});
code.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
- final Component scrollPane2 = new RTextScrollPane(code);
+ return code;
+ }
+
+ @NotNull
+ private Component createCodePanel(@NotNull final PluginController<G, A, R> pluginController) {
+ final Component scrollPane2 = new RTextScrollPane(createCode());
final Container codePanel = new JPanel(new BorderLayout());
codePanel.add(scrollPane2, BorderLayout.CENTER);
final Container codeBottom = new JPanel(new FlowLayout());
@@ -337,7 +348,7 @@
});
codeBottom.add(test);
codePanel.add(codeBottom, BorderLayout.SOUTH);
- tabs.addTab("Code", codePanel);
+ return codePanel;
}
public void selectTableComponent(@NotNull final Component c) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-11-23 09:38:18
|
Revision: 9489
http://sourceforge.net/p/gridarta/code/9489
Author: akirschbaum
Date: 2013-11-23 09:38:15 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Clean up code.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 09:36:38 UTC (rev 9488)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 09:38:15 UTC (rev 9489)
@@ -77,7 +77,7 @@
private static final Category log = Logger.getLogger(PluginEditor.class);
@NotNull
- private final JPanel panel = new JPanel();
+ private final JPanel panel = new JPanel(new BorderLayout());
@NotNull
private final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory;
@@ -167,12 +167,12 @@
this.pluginModel = pluginModel;
this.plugin = plugin;
this.pluginParameterViewFactory = pluginParameterViewFactory;
+
final JTabbedPane tabs = new JTabbedPane();
- panel.setLayout(new BorderLayout());
- panel.add(tabs);
- tabs.add("Options", createOptionsTab(pluginController, resourceIcons));
+ tabs.addTab("Options", createOptionsTab(pluginController, resourceIcons));
tabs.addTab("Manual run parameters", createParameterTab());
tabs.addTab("Code", createCodePanel(pluginController));
+ panel.add(tabs);
}
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-11-23 09:39:20
|
Revision: 9490
http://sourceforge.net/p/gridarta/code/9490
Author: akirschbaum
Date: 2013-11-23 09:39:17 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Clean up code.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 09:38:15 UTC (rev 9489)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 09:39:17 UTC (rev 9490)
@@ -307,7 +307,7 @@
}
@NotNull
- private RSyntaxTextArea createCode() {
+ private Component createCode() {
final RSyntaxTextArea code = new RSyntaxTextArea();
code.setText(plugin.getCode());
code.setFont(new Font("Monospaced", Font.PLAIN, 14));
@@ -329,14 +329,13 @@
}
});
code.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
- return code;
+ return new RTextScrollPane(code);
}
@NotNull
private Component createCodePanel(@NotNull final PluginController<G, A, R> pluginController) {
- final Component scrollPane2 = new RTextScrollPane(createCode());
final Container codePanel = new JPanel(new BorderLayout());
- codePanel.add(scrollPane2, BorderLayout.CENTER);
+ codePanel.add(createCode(), BorderLayout.CENTER);
final Container codeBottom = new JPanel(new FlowLayout());
final AbstractButton test = new JButton("Run Script...");
test.addActionListener(new ActionListener() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-11-23 12:34:21
|
Revision: 9496
http://sourceforge.net/p/gridarta/code/9496
Author: akirschbaum
Date: 2013-11-23 12:34:15 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Weaken type.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 12:30:53 UTC (rev 9495)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 12:34:15 UTC (rev 9496)
@@ -90,7 +90,7 @@
private final PluginController<G, A, R> pluginController;
@NotNull
- private final JPanel panel = new JPanel(new BorderLayout());
+ private final Container panel = new JPanel(new BorderLayout());
@NotNull
private final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-11-23 12:34:59
|
Revision: 9497
http://sourceforge.net/p/gridarta/code/9497
Author: akirschbaum
Date: 2013-11-23 12:34:52 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Remove unused code.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 12:34:15 UTC (rev 9496)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2013-11-23 12:34:52 UTC (rev 9497)
@@ -173,7 +173,7 @@
final JTabbedPane tabs = new JTabbedPane();
tabs.addTab(ActionBuilderUtils.getString(ACTION_BUILDER, "pluginEditorTabOptions"), createOptionsTab(resourceIcons));
tabs.addTab(ActionBuilderUtils.getString(ACTION_BUILDER, "pluginEditorTabParameters"), createParameterTab());
- tabs.addTab(ActionBuilderUtils.getString(ACTION_BUILDER, "pluginEditorTabCode"), createCodePanel(pluginController));
+ tabs.addTab(ActionBuilderUtils.getString(ACTION_BUILDER, "pluginEditorTabCode"), createCodePanel());
panel.add(tabs);
}
@@ -305,7 +305,7 @@
}
@NotNull
- private Component createCodePanel(@NotNull final PluginController<G, A, R> pluginController) {
+ private Component createCodePanel() {
final Container codeBottom = new JPanel(new FlowLayout());
codeBottom.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorRunScript", this)));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-01-26 20:04:50
|
Revision: 9548
http://sourceforge.net/p/gridarta/code/9548
Author: akirschbaum
Date: 2014-01-26 20:04:44 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
Remove unneeded debug messages.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-01-26 19:49:14 UTC (rev 9547)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-01-26 20:04:44 UTC (rev 9548)
@@ -62,8 +62,6 @@
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
-import org.apache.log4j.Category;
-import org.apache.log4j.Logger;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.fife.ui.rtextarea.RTextScrollPane;
@@ -72,12 +70,6 @@
public class PluginEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
/**
- * The Logger for printing log messages.
- */
- @NotNull
- private static final Category log = Logger.getLogger(PluginEditor.class);
-
- /**
* Action Builder.
*/
@NotNull
@@ -351,10 +343,6 @@
}
private Component getParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
- if (log.isDebugEnabled()) {
- log.debug("Doing " + param);
- }
-
final Component existingParameterNameEditor = paramNameEditors.get(param);
if (existingParameterNameEditor != null) {
return existingParameterNameEditor;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-01-26 20:07:08
|
Revision: 9549
http://sourceforge.net/p/gridarta/code/9549
Author: akirschbaum
Date: 2014-01-26 20:07:03 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
Add nullable annotations.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-01-26 20:04:44 UTC (rev 9548)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-01-26 20:07:03 UTC (rev 9549)
@@ -342,6 +342,7 @@
c.addMouseListener(cellMouseListener);
}
+ @NotNull
private Component getParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
final Component existingParameterNameEditor = paramNameEditors.get(param);
if (existingParameterNameEditor != null) {
@@ -354,6 +355,7 @@
return newParameterNameEditor;
}
+ @NotNull
private Component getParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
final Component existingParameterDescriptionEditor = paramDescriptionEditors.get(param);
if (existingParameterDescriptionEditor != null) {
@@ -366,6 +368,7 @@
return newParameterDescriptionEditor;
}
+ @NotNull
private Component getParameterTypeEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
final Component existingParameterTypeEditor = paramTypeEditors.get(param);
if (existingParameterTypeEditor != null) {
@@ -378,6 +381,7 @@
return newParameterTypeEditor;
}
+ @NotNull
private PluginParameterView<G, A, R> getParameterView(@NotNull final PluginParameter<G, A, R, ?> param) {
final PluginParameterView<G, A, R> existingPluginParameterView = paramViews.get(param);
if (existingPluginParameterView != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-02-22 07:26:07
|
Revision: 9606
http://sourceforge.net/p/gridarta/code/9606
Author: akirschbaum
Date: 2014-02-22 07:25:59 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Merge duplicated code.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 07:19:23 UTC (rev 9605)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 07:25:59 UTC (rev 9606)
@@ -392,11 +392,12 @@
@Override
public void itemStateChanged(@NotNull final ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
- if (!parameter.getParameterType().equals(e.getItem())) {
+ final String newParameterType = (String) e.getItem();
+ if (!parameter.getParameterType().equals(newParameterType)) {
try {
- plugin.convertType(parameter, (String) e.getItem());
+ plugin.convertType(parameter, newParameterType);
} catch (final NoSuchParameterException ex) {
- LOG.warn("Cannot create parameter for type " + e.getItem());
+ LOG.warn("Cannot create parameter for type " + newParameterType);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-02-22 07:26:52
|
Revision: 9607
http://sourceforge.net/p/gridarta/code/9607
Author: akirschbaum
Date: 2014-02-22 07:26:49 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Replace if statements with guards.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 07:25:59 UTC (rev 9606)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 07:26:49 UTC (rev 9607)
@@ -391,16 +391,20 @@
@Override
public void itemStateChanged(@NotNull final ItemEvent e) {
- if (e.getStateChange() == ItemEvent.SELECTED) {
- final String newParameterType = (String) e.getItem();
- if (!parameter.getParameterType().equals(newParameterType)) {
- try {
- plugin.convertType(parameter, newParameterType);
- } catch (final NoSuchParameterException ex) {
- LOG.warn("Cannot create parameter for type " + newParameterType);
- }
- }
+ if (e.getStateChange() != ItemEvent.SELECTED) {
+ return;
}
+
+ final String newParameterType = (String) e.getItem();
+ if (parameter.getParameterType().equals(newParameterType)) {
+ return;
+ }
+
+ try {
+ plugin.convertType(parameter, newParameterType);
+ } catch (final NoSuchParameterException ex) {
+ LOG.warn("Cannot create parameter for type " + newParameterType);
+ }
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-02-22 07:47:06
|
Revision: 9612
http://sourceforge.net/p/gridarta/code/9612
Author: akirschbaum
Date: 2014-02-22 07:47:03 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Do not call PluginParameter.equals().
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 07:46:21 UTC (rev 9611)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 07:47:03 UTC (rev 9612)
@@ -33,7 +33,7 @@
import java.awt.event.ItemListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
-import java.util.HashMap;
+import java.util.IdentityHashMap;
import java.util.Map;
import javax.swing.JButton;
import javax.swing.JCheckBox;
@@ -107,16 +107,16 @@
private final Plugin<G, A, R> plugin;
@NotNull
- private final Map<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>> parameterNameEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>>();
+ private final Map<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>> parameterNameEditors = new IdentityHashMap<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>>();
@NotNull
- private final Map<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>> parameterDescriptionEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>>();
+ private final Map<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>> parameterDescriptionEditors = new IdentityHashMap<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>>();
@NotNull
- private final Map<PluginParameter<G, A, R, ?>, Component> parameterTypeEditors = new HashMap<PluginParameter<G, A, R, ?>, Component>();
+ private final Map<PluginParameter<G, A, R, ?>, Component> parameterTypeEditors = new IdentityHashMap<PluginParameter<G, A, R, ?>, Component>();
@NotNull
- private final Map<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>> parameterViews = new HashMap<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>>();
+ private final Map<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>> parameterViews = new IdentityHashMap<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>>();
private int selectedRow = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-02-22 10:49:09
|
Revision: 9622
http://sourceforge.net/p/gridarta/code/9622
Author: akirschbaum
Date: 2014-02-22 10:49:04 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Reorganize code.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 10:38:50 UTC (rev 9621)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 10:49:04 UTC (rev 9622)
@@ -317,31 +317,41 @@
parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDefault.text"), gbc);
int i = 0;
for (final PluginParameter<G, A, R, ?> parameter : plugin) {
+ final PluginEditorRow row = getOrCreateRow(parameter);
gbc.gridy = i + 1;
- putRow(gbc, parameter);
+ gbc.gridx = 0;
+ parameterTable.add(row.getParameterNameEditor(), gbc);
+ gbc.gridx = 1;
+ gbc.weightx = 0.5;
+ parameterTable.add(row.getParameterDescriptionEditor(), gbc);
+ gbc.gridx = 2;
+ gbc.weightx = 0.1;
+ parameterTable.add(row.getParameterTypeEditor(), gbc);
+ gbc.gridx = 3;
+ parameterTable.add(row.getConfigComponent(), gbc);
+ gbc.gridx = 4;
+ parameterTable.add(row.getValueComponent(), gbc);
i++;
}
panel.repaint();
}
- private void putRow(@NotNull final GridBagConstraints gbc, @NotNull final PluginParameter<G, A, R, ?> parameter) {
- PluginEditorRow row = rows.get(parameter);
- if (row == null) {
- row = new PluginEditorRow(plugin, parameter, pluginParameterViewFactory, cellMouseListener, cellFocusListener, panel);
- rows.put(parameter, row);
+ /**
+ * Returns the {@link PluginEditorRow} instance for a {@link
+ * PluginParameter}. Returned instances are cached.
+ * @param parameter the plugin parameter
+ * @return the plugin editor row instance
+ */
+ @NotNull
+ private PluginEditorRow getOrCreateRow(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+ final PluginEditorRow existingRow = rows.get(parameter);
+ if (existingRow != null) {
+ return existingRow;
}
- gbc.gridx = 0;
- parameterTable.add(row.getParameterNameEditor(), gbc);
- gbc.gridx = 1;
- gbc.weightx = 0.5;
- parameterTable.add(row.getParameterDescriptionEditor(), gbc);
- gbc.gridx = 2;
- gbc.weightx = 0.1;
- parameterTable.add(row.getParameterTypeEditor(), gbc);
- gbc.gridx = 3;
- parameterTable.add(row.getConfigComponent(), gbc);
- gbc.gridx = 4;
- parameterTable.add(row.getValueComponent(), gbc);
+
+ final PluginEditorRow row = new PluginEditorRow(plugin, parameter, pluginParameterViewFactory, cellMouseListener, cellFocusListener, panel);
+ rows.put(parameter, row);
+ return row;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-02-22 13:00:51
|
Revision: 9625
http://sourceforge.net/p/gridarta/code/9625
Author: akirschbaum
Date: 2014-02-22 13:00:48 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Simplify code.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 12:59:26 UTC (rev 9624)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 13:00:48 UTC (rev 9625)
@@ -315,10 +315,9 @@
parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleConfig.text"), gbc);
gbc.gridx = 4;
parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDefault.text"), gbc);
- int i = 0;
for (final PluginParameter<G, A, R, ?> parameter : plugin) {
final PluginEditorRow row = getOrCreateRow(parameter);
- gbc.gridy = i + 1;
+ gbc.gridy++;
gbc.gridx = 0;
parameterTable.add(row.getParameterNameEditor(), gbc);
gbc.gridx = 1;
@@ -331,7 +330,6 @@
parameterTable.add(row.getConfigComponent(), gbc);
gbc.gridx = 4;
parameterTable.add(row.getValueComponent(), gbc);
- i++;
}
panel.repaint();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X