Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[9590] trunk/src
|
From: <aki...@us...> - 2014-02-21 20:33:48
|
Revision: 9590
http://sourceforge.net/p/gridarta/code/9590
Author: akirschbaum
Date: 2014-02-21 20:33:41 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Rename identifiers.
Modified Paths:
--------------
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/parameter/ArchParameterView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java
trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginExecutor.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/SyntaxStyle.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.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-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-21 20:33:41 UTC (rev 9590)
@@ -88,7 +88,7 @@
private final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory;
@NotNull
- private final JPanel paramTable = new JPanel(new GridBagLayout());
+ private final JPanel parameterTable = new JPanel(new GridBagLayout());
@NotNull
private final PluginModel<G, A, R> pluginModel;
@@ -97,16 +97,16 @@
private final Plugin<G, A, R> plugin;
@NotNull
- private final Map<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>> paramNameEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>>();
+ private final Map<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>> parameterNameEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>>();
@NotNull
- private final Map<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>> paramDescriptionEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>>();
+ private final Map<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>> parameterDescriptionEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>>();
@NotNull
- private final Map<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>> paramTypeEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>>();
+ private final Map<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>> parameterTypeEditors = new HashMap<PluginParameter<G, A, R, ?>, ParameterTypeEditor<G, A, R>>();
@NotNull
- private final Map<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>> paramViews = new HashMap<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>>();
+ private final Map<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>> parameterViews = new HashMap<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>>();
private int selectedRow = -1;
@@ -174,10 +174,10 @@
final Container optionsTab = new JPanel(new GridBagLayout());
final GridBagConstraints gbc = new GridBagConstraints();
- final Container paramButtons = new JPanel();
- paramButtons.setLayout(new StackLayout(5));
- paramButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorReRegister", this)));
- paramButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorExport", this)));
+ final Container parameterButtons = new JPanel();
+ parameterButtons.setLayout(new StackLayout(5));
+ parameterButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorReRegister", this)));
+ parameterButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorExport", this)));
gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.gridx = 0;
@@ -218,7 +218,7 @@
gbc.fill = GridBagConstraints.NONE;
gbc.gridy = 4;
- optionsTab.add(paramButtons, gbc);
+ optionsTab.add(parameterButtons, gbc);
gbc.gridx = 0;
gbc.gridy = 5;
@@ -241,10 +241,10 @@
}
});
- final Container paramButtons = new JPanel();
- paramButtons.setLayout(new StackLayout(5));
- paramButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorAddParameter", this)));
- paramButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorRemoveParameter", this)));
+ final Container parameterButtons = new JPanel();
+ parameterButtons.setLayout(new StackLayout(5));
+ parameterButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorAddParameter", this)));
+ parameterButtons.add(new JButton(ACTION_BUILDER.createAction(false, "pluginEditorRemoveParameter", this)));
final GridBagConstraints gbc = new GridBagConstraints();
@@ -256,9 +256,9 @@
gbc.anchor = GridBagConstraints.WEST;
final Container parameterTab = new JPanel(new GridBagLayout());
- parameterTab.add(new JScrollPane(paramTable), gbc);
+ parameterTab.add(new JScrollPane(parameterTable), gbc);
gbc.gridy++;
- parameterTab.add(paramButtons, gbc);
+ parameterTab.add(parameterButtons, gbc);
gbc.gridy++;
gbc.weighty = 1.0;
gbc.fill = GridBagConstraints.BOTH;
@@ -309,7 +309,7 @@
}
public void selectTableComponent(@NotNull final Component c) {
- final GridBagLayout l = (GridBagLayout) paramTable.getLayout();
+ final GridBagLayout l = (GridBagLayout) parameterTable.getLayout();
final GridBagConstraints gbc = l.getConstraints(c);
if (gbc != null) {
selectedRow = gbc.gridy - 1;
@@ -318,16 +318,16 @@
private void redrawTable() {
final GridBagConstraints gbc = new GridBagConstraints(0, 0, 1, 1, 0.1, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 5, 0);
- paramTable.removeAll();
- paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleName.text"), gbc);
+ parameterTable.removeAll();
+ parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleName.text"), gbc);
gbc.gridx = 1;
- paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDescription.text"), gbc);
+ parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDescription.text"), gbc);
gbc.gridx = 2;
- paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleType.text"), gbc);
+ parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleType.text"), gbc);
gbc.gridx = 3;
- paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleConfig.text"), gbc);
+ parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleConfig.text"), gbc);
gbc.gridx = 4;
- paramTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDefault.text"), gbc);
+ parameterTable.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "pluginEditorTitleDefault.text"), gbc);
int i = 0;
for (final PluginParameter<G, A, R, ?> parameter : plugin) {
gbc.gridy = i + 1;
@@ -343,73 +343,73 @@
}
@NotNull
- private Component getParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
- final Component existingParameterNameEditor = paramNameEditors.get(param);
+ private Component getParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+ final Component existingParameterNameEditor = parameterNameEditors.get(parameter);
if (existingParameterNameEditor != null) {
return existingParameterNameEditor;
}
- final ParameterNameEditor<G, A, R> newParameterNameEditor = new ParameterNameEditor<G, A, R>(param);
- paramNameEditors.put(param, newParameterNameEditor);
+ final ParameterNameEditor<G, A, R> newParameterNameEditor = new ParameterNameEditor<G, A, R>(parameter);
+ parameterNameEditors.put(parameter, newParameterNameEditor);
newTableComponent(newParameterNameEditor);
return newParameterNameEditor;
}
@NotNull
- private Component getParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
- final Component existingParameterDescriptionEditor = paramDescriptionEditors.get(param);
+ private Component getParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+ final Component existingParameterDescriptionEditor = parameterDescriptionEditors.get(parameter);
if (existingParameterDescriptionEditor != null) {
return existingParameterDescriptionEditor;
}
- final ParameterDescriptionEditor<G, A, R> newParameterDescriptionEditor = new ParameterDescriptionEditor<G, A, R>(param);
+ final ParameterDescriptionEditor<G, A, R> newParameterDescriptionEditor = new ParameterDescriptionEditor<G, A, R>(parameter);
newTableComponent(newParameterDescriptionEditor);
- paramDescriptionEditors.put(param, newParameterDescriptionEditor);
+ parameterDescriptionEditors.put(parameter, newParameterDescriptionEditor);
return newParameterDescriptionEditor;
}
@NotNull
- private Component getParameterTypeEditor(@NotNull final PluginParameter<G, A, R, ?> param) {
- final Component existingParameterTypeEditor = paramTypeEditors.get(param);
+ private Component getParameterTypeEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+ final Component existingParameterTypeEditor = parameterTypeEditors.get(parameter);
if (existingParameterTypeEditor != null) {
return existingParameterTypeEditor;
}
- final ParameterTypeEditor<G, A, R> newParameterTypeEditor = new ParameterTypeEditor<G, A, R>(pluginModel, plugin, param);
- paramTypeEditors.put(param, newParameterTypeEditor);
+ final ParameterTypeEditor<G, A, R> newParameterTypeEditor = new ParameterTypeEditor<G, A, R>(pluginModel, plugin, parameter);
+ parameterTypeEditors.put(parameter, newParameterTypeEditor);
newTableComponent(newParameterTypeEditor);
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);
+ private PluginParameterView<G, A, R> getParameterView(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+ final PluginParameterView<G, A, R> existingPluginParameterView = parameterViews.get(parameter);
if (existingPluginParameterView != null) {
return existingPluginParameterView;
}
- final PluginParameterView<G, A, R> newPluginParameterView = pluginParameterViewFactory.getView(paramTable, param);
+ final PluginParameterView<G, A, R> newPluginParameterView = pluginParameterViewFactory.getView(parameterTable, parameter);
newTableComponent(newPluginParameterView.getConfigComponent());
newTableComponent(newPluginParameterView.getValueComponent());
- paramViews.put(param, newPluginParameterView);
+ parameterViews.put(parameter, newPluginParameterView);
return newPluginParameterView;
}
- private void putRow(@NotNull final GridBagConstraints gbc, @NotNull final PluginParameter<G, A, R, ?> param) {
+ private void putRow(@NotNull final GridBagConstraints gbc, @NotNull final PluginParameter<G, A, R, ?> parameter) {
gbc.gridx = 0;
- paramTable.add(getParameterNameEditor(param), gbc);
+ parameterTable.add(getParameterNameEditor(parameter), gbc);
gbc.gridx = 1;
gbc.weightx = 0.5;
- paramTable.add(getParameterDescriptionEditor(param), gbc);
+ parameterTable.add(getParameterDescriptionEditor(parameter), gbc);
gbc.gridx = 2;
gbc.weightx = 0.1;
- paramTable.add(getParameterTypeEditor(param), gbc);
+ parameterTable.add(getParameterTypeEditor(parameter), gbc);
gbc.gridx = 3;
- paramTable.add(getParameterView(param).getConfigComponent(), gbc);
+ parameterTable.add(getParameterView(parameter).getConfigComponent(), gbc);
gbc.gridx = 4;
- paramTable.add(getParameterView(param).getValueComponent(), gbc);
+ parameterTable.add(getParameterView(parameter).getValueComponent(), gbc);
}
/**
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java 2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java 2014-02-21 20:33:41 UTC (rev 9590)
@@ -50,10 +50,10 @@
* @param faceObjectProviders the face object providers for looking up
* faces
*/
- public ArchParameterView(@NotNull final ArchetypeParameter<G, A, R> param, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders) {
+ public ArchParameterView(@NotNull final ArchetypeParameter<G, A, R> parameter, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders) {
value = new ArchComboBox<G, A, R>(gameObjectAttributesModel, archetypeSet, objectChooser, faceObjectProviders);
- parameter = param;
- value.setSelectedItem(param.getValue());
+ this.parameter = parameter;
+ value.setSelectedItem(parameter.getValue());
value.addItemListener(new ItemListener() {
@Override
@@ -62,7 +62,7 @@
//JComboBox does not use type parameters
@SuppressWarnings("unchecked")
final Archetype<G, A, R> archetype = (Archetype<G, A, R>) value.getSelectedItem();
- parameter.setStringValue(archetype.getArchetypeName());
+ ArchParameterView.this.parameter.setStringValue(archetype.getArchetypeName());
}
}
});
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java 2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java 2014-02-21 20:33:41 UTC (rev 9590)
@@ -43,8 +43,8 @@
@NotNull
private final BooleanParameter<G, A, R> parameter;
- public BooleanParameterView(@NotNull final BooleanParameter<G, A, R> param) {
- parameter = param;
+ public BooleanParameterView(@NotNull final BooleanParameter<G, A, R> parameter) {
+ this.parameter = parameter;
value = new JCheckBox();
value.setActionCommand("toggle");
value.addActionListener(this);
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java 2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java 2014-02-21 20:33:41 UTC (rev 9590)
@@ -49,19 +49,19 @@
@NotNull
private final DoubleParameter<G, A, R> parameter;
- public DoubleParameterView(@NotNull final DoubleParameter<G, A, R> param) {
- parameter = param;
- final SpinnerModel mdl = new SpinnerNumberModel(0.0, param.getMin(), param.getMax(), (param.getMax() - param.getMin()) / 100.0);
+ public DoubleParameterView(@NotNull final DoubleParameter<G, A, R> parameter) {
+ this.parameter = parameter;
+ final SpinnerModel mdl = new SpinnerNumberModel(0.0, parameter.getMin(), parameter.getMax(), (parameter.getMax() - parameter.getMin()) / 100.0);
value = new TooltipSpinner(mdl);
try {
- value.setValue(param.getValue());
+ value.setValue(parameter.getValue());
} catch (final IllegalArgumentException e) {
}
value.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(final ChangeEvent e) {
- parameter.setValue((Double) ((SpinnerNumberModel) value.getModel()).getNumber());
+ DoubleParameterView.this.parameter.setValue((Double) ((SpinnerNumberModel) value.getModel()).getNumber());
}
});
config = new JButton("...");
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java 2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java 2014-02-21 20:33:41 UTC (rev 9590)
@@ -45,8 +45,8 @@
@NotNull
private final JComboBox value;
- public MapParameterView(@NotNull final MapParameter<G, A, R> param, @NotNull final MapManager<G, A, R> mapManager) {
- parameter = param;
+ public MapParameterView(@NotNull final MapParameter<G, A, R> parameter, @NotNull final MapManager<G, A, R> mapManager) {
+ this.parameter = parameter;
value = new JComboBox();
final ComboBoxModel myModel = new MapParameterComboBoxModel<G, A, R>(mapManager);
value.setModel(myModel);
@@ -57,7 +57,7 @@
public void itemStateChanged(final ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
if (value.getSelectedIndex() == 0) {
- parameter.setValueToCurrent();
+ MapParameterView.this.parameter.setValueToCurrent();
} else {
final MapControl<?, ?, ?> mapControl = (MapControl<?, ?, ?>) value.getSelectedItem();
final String stringValue;
@@ -67,12 +67,12 @@
final MapFile mapFile = mapControl.getMapModel().getMapFile();
stringValue = mapFile == null ? "" : mapFile.getMapPath().getPath();
}
- parameter.setStringValue(stringValue);
+ MapParameterView.this.parameter.setStringValue(stringValue);
}
}
}
});
- value.setSelectedItem(parameter.getValue());
+ value.setSelectedItem(this.parameter.getValue());
}
/**
Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java 2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java 2014-02-21 20:33:41 UTC (rev 9590)
@@ -190,13 +190,13 @@
/**
* Returns the index for a plugin parameter name.
- * @param paramName the plugin parameter name
+ * @param parameterName the plugin parameter name
* @return the index or {@code -1} if the parameter name does not exist
*/
- public int getParameter(@NotNull final String paramName) {
+ public int getParameter(@NotNull final String parameterName) {
int index = 0;
for (final PluginParameter<G, A, R, ?> parameter : parameters) {
- if (parameter.getName().equals(paramName)) {
+ if (parameter.getName().equals(parameterName)) {
return index;
}
index++;
@@ -281,10 +281,10 @@
model.file = file;
model.modified = modified;
for (final PluginParameter<G, A, R, ?> parameter : parameters) {
- final Element paramXml = codec.toXML(parameter);
+ final Element parameterXml = codec.toXML(parameter);
final PluginParameter<G, A, R, ?> clonedParam;
try {
- clonedParam = pluginParameterFactory.createParameter(paramXml);
+ clonedParam = pluginParameterFactory.createParameter(parameterXml);
} catch (final NoSuchParameterException ex) {
throw new AssertionError(ex);
}
Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginExecutor.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginExecutor.java 2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginExecutor.java 2014-02-21 20:33:41 UTC (rev 9590)
@@ -68,10 +68,10 @@
/**
* Executes an editor plugin.
* @param plugin the plugin name to execute
- * @param params the plugin parameters
+ * @param parameters the plugin parameters
* @return whether an error occurred
*/
- public int executePlugin(@NotNull final String plugin, @NotNull final Iterable<String> params) {
+ public int executePlugin(@NotNull final String plugin, @NotNull final Iterable<String> parameters) {
final Plugin<G, A, R> modelTemplate = pluginModel.getPlugin(plugin);
if (modelTemplate == null) {
System.err.println("plugin " + plugin + " does not exist");
@@ -80,10 +80,10 @@
final Plugin<G, A, R> clonedPlugin = modelTemplate.clonePlugin();
- for (final String param : params) {
- final String[] tmp = StringUtils.PATTERN_EQUAL.split(param, 2);
+ for (final String parameter : parameters) {
+ final String[] tmp = StringUtils.PATTERN_EQUAL.split(parameter, 2);
if (tmp.length != 2) {
- System.err.println("syntax error: " + param);
+ System.err.println("syntax error: " + parameter);
return 1;
}
@@ -91,22 +91,22 @@
if (index == -1) {
final StringBuilder sb = new StringBuilder();
boolean firstParameter = true;
- for (final PluginParameter<?, ?, ?, ?> parameter : clonedPlugin) {
+ for (final PluginParameter<?, ?, ?, ?> clonedParameter : clonedPlugin) {
sb.append(firstParameter ? " " : ", ");
- sb.append(parameter.getName());
+ sb.append(clonedParameter.getName());
firstParameter = false;
}
System.err.println("plugin " + plugin + " has no parameter " + tmp[0] + "; available parameters:" + sb);
return 1;
}
- final PluginParameter<G, A, R, ?> parameter;
+ final PluginParameter<G, A, R, ?> clonedParameter;
try {
- parameter = clonedPlugin.getParameter(index);
+ clonedParameter = clonedPlugin.getParameter(index);
} catch (final NoSuchParameterException ex) {
throw new AssertionError(ex);
}
- if (!parameter.setStringValue(tmp[1])) {
+ if (!clonedParameter.setStringValue(tmp[1])) {
System.out.println("invalid value " + tmp[1] + " for parameter " + tmp[0]);
return 1;
}
Modified: trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/SyntaxStyle.java
===================================================================
--- trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/SyntaxStyle.java 2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/SyntaxStyle.java 2014-02-21 20:33:41 UTC (rev 9590)
@@ -110,7 +110,7 @@
*/
private Font getStyledFont(final Font font) {
if (font == null) {
- throw new IllegalArgumentException("font param must not be null");
+ throw new IllegalArgumentException("font parameter must not be null");
}
updateStyledFont(font);
@@ -125,7 +125,7 @@
*/
public FontMetrics getFontMetrics(final Font font, final Graphics g) {
if (font == null) {
- throw new IllegalArgumentException("font param must not be null");
+ throw new IllegalArgumentException("font parameter must not be null");
}
updateStyledFont(font);
Modified: trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
===================================================================
--- trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2014-02-20 22:18:44 UTC (rev 9589)
+++ trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2014-02-21 20:33:41 UTC (rev 9590)
@@ -128,23 +128,23 @@
offset2 += spacesLength1;
while (it.hasNext()) {
- final int paramLength = it.next();
- final String[] tmp = StringUtils.PATTERN_EQUAL.split(new String(array, offset2, paramLength), 2);
+ final int parameterLength = it.next();
+ final String[] tmp = StringUtils.PATTERN_EQUAL.split(new String(array, offset2, parameterLength), 2);
if (tmp.length == 2) {
- final String param = tmp[0];
- final String arg = tmp[1];
+ final String parameterString = tmp[0];
+ final String valueString = tmp[1];
- final Parameter parameter = spec != null ? spec.getParameter(param) : null;
+ final Parameter parameter = spec != null ? spec.getParameter(parameterString) : null;
final boolean parameterValid = parameter != null;
- final boolean valueValid = parameter == null || parameter.getParameterType().getPattern().matcher(arg).matches();
- addToken(param.length(), parameterValid ? parameter.getId() : Token.INVALID);
- addToken(1, (param.isEmpty() && !parameterValid) || (arg.isEmpty() && !valueValid) ? Token.INVALID : Token.OPERATOR);
- addToken(arg.length(), valueValid ? Token.NULL : Token.INVALID);
+ final boolean valueValid = parameter == null || parameter.getParameterType().getPattern().matcher(valueString).matches();
+ addToken(parameterString.length(), parameterValid ? parameter.getId() : Token.INVALID);
+ addToken(1, (parameterString.isEmpty() && !parameterValid) || (valueString.isEmpty() && !valueValid) ? Token.INVALID : Token.OPERATOR);
+ addToken(valueString.length(), valueValid ? Token.NULL : Token.INVALID);
} else {
// missing '=' sign ==> syntax error
- addToken(paramLength, Token.INVALID);
+ addToken(parameterLength, Token.INVALID);
}
- offset2 += paramLength;
+ offset2 += parameterLength;
final int spacesLength2 = it.next();
addToken(spacesLength2, Token.NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
