Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[5308] trunk
|
From: <aki...@us...> - 2008-10-01 16:03:06
|
Revision: 5308
http://gridarta.svn.sourceforge.net/gridarta/?rev=5308&view=rev
Author: akirschbaum
Date: 2008-10-01 16:02:21 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
Remove raw types.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/script/ScriptEditor.java
trunk/crossfire/src/cfeditor/gui/script/ScriptView.java
trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterDescriptionEditor.java
trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterTypeEditor.java
trunk/crossfire/src/cfeditor/gui/script/parameter/PluginParameterViewFactory.java
trunk/crossfire/src/cfeditor/script/ScriptController.java
trunk/src/app/net/sf/gridarta/script/ScriptModel.java
trunk/src/app/net/sf/gridarta/script/parameter/PluginParameterFactory.java
Modified: trunk/crossfire/src/cfeditor/gui/script/ScriptEditor.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/script/ScriptEditor.java 2008-10-01 15:35:31 UTC (rev 5307)
+++ trunk/crossfire/src/cfeditor/gui/script/ScriptEditor.java 2008-10-01 16:02:21 UTC (rev 5308)
@@ -77,13 +77,13 @@
private final ScriptModel script;
- private final Map<PluginParameter, ParameterNameEditor> paramNameEditors = new HashMap<PluginParameter, ParameterNameEditor>();
+ private final Map<PluginParameter<?, ?>, ParameterNameEditor> paramNameEditors = new HashMap<PluginParameter<?, ?>, ParameterNameEditor>();
- private final Map<PluginParameter, ParameterDescriptionEditor> paramDescriptionEditors = new HashMap<PluginParameter, ParameterDescriptionEditor>();
+ private final Map<PluginParameter<?, ?>, ParameterDescriptionEditor> paramDescriptionEditors = new HashMap<PluginParameter<?, ?>, ParameterDescriptionEditor>();
- private final Map<PluginParameter, ParameterTypeEditor> paramTypeEditors = new HashMap<PluginParameter, ParameterTypeEditor>();
+ private final Map<PluginParameter<?, ?>, ParameterTypeEditor> paramTypeEditors = new HashMap<PluginParameter<?, ?>, ParameterTypeEditor>();
- private final Map<PluginParameter, PluginParameterView> paramViews = new HashMap<PluginParameter, PluginParameterView>();
+ private final Map<PluginParameter<?, ?>, PluginParameterView> paramViews = new HashMap<PluginParameter<?, ?>, PluginParameterView>();
private int selectedRow = -1;
@@ -233,7 +233,7 @@
return;
}
- final PluginParameter parameter;
+ final PluginParameter<?, ?> parameter;
try {
parameter = getScript().getParameter(selectedRow);
} catch (final NoSuchParameterException ex) {
@@ -301,7 +301,7 @@
gbc.gridx = 4;
paramTable.add(new JLabel("Default"), gbc);
int i = 0;
- for (final PluginParameter parameter : script) {
+ for (final PluginParameter<?, ?> parameter : script) {
gbc.gridy = i + 1;
putRow(gbc, parameter);
i++;
@@ -314,7 +314,7 @@
c.addMouseListener(cellMouseListener);
}
- private ParameterNameEditor getParameterNameEditor(final PluginParameter param) {
+ private ParameterNameEditor getParameterNameEditor(final PluginParameter<?, ?> param) {
if (log.isDebugEnabled()) {
log.debug("Doing " + param);
}
@@ -330,7 +330,7 @@
return newParameterNameEditor;
}
- private ParameterDescriptionEditor getParameterDescriptionEditor(final PluginParameter param) {
+ private ParameterDescriptionEditor getParameterDescriptionEditor(final PluginParameter<?, ?> param) {
final ParameterDescriptionEditor existingParameterDescriptionEditor = paramDescriptionEditors.get(param);
if (existingParameterDescriptionEditor != null) {
return existingParameterDescriptionEditor;
@@ -342,7 +342,7 @@
return newParameterDescriptionEditor;
}
- private ParameterTypeEditor getParameterTypeEditor(final PluginParameter param) {
+ private ParameterTypeEditor getParameterTypeEditor(final PluginParameter<?, ?> param) {
final ParameterTypeEditor existingPArameterTypeEditor = paramTypeEditors.get(param);
if (existingPArameterTypeEditor != null) {
return existingPArameterTypeEditor;
@@ -354,7 +354,7 @@
return newParameterTypeEditor;
}
- private PluginParameterView getParameterView(final PluginParameter param) {
+ private PluginParameterView getParameterView(final PluginParameter<?, ?> param) {
final PluginParameterView existingPluginParameterView = paramViews.get(param);
if (existingPluginParameterView != null) {
return existingPluginParameterView;
@@ -375,7 +375,7 @@
return newPluginParameterView;
}
- private void putRow(final GridBagConstraints gbc, final PluginParameter param) {
+ private void putRow(final GridBagConstraints gbc, final PluginParameter<?, ?> param) {
gbc.gridx = 0;
paramTable.add(getParameterNameEditor(param), gbc);
gbc.gridx = 1;
Modified: trunk/crossfire/src/cfeditor/gui/script/ScriptView.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/script/ScriptView.java 2008-10-01 15:35:31 UTC (rev 5307)
+++ trunk/crossfire/src/cfeditor/gui/script/ScriptView.java 2008-10-01 16:02:21 UTC (rev 5308)
@@ -217,7 +217,7 @@
dialog.setTitle(model.getName());
dialog.getContentPane().removeAll();
int i = 0;
- for (final PluginParameter parameter : model) {
+ for (final PluginParameter<?, ?> parameter : model) {
log.debug("adding parameter");
final JLabel name = new JLabel(parameter.getName());
final PluginParameterView view = pluginParameterViewFactory.getView(parameter);
Modified: trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterDescriptionEditor.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterDescriptionEditor.java 2008-10-01 15:35:31 UTC (rev 5307)
+++ trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterDescriptionEditor.java 2008-10-01 16:02:21 UTC (rev 5308)
@@ -26,11 +26,11 @@
public class ParameterDescriptionEditor extends JTextField {
- private final PluginParameter parameter;
+ private final PluginParameter<?, ?> parameter;
private static final long serialVersionUID = 1L;
- public ParameterDescriptionEditor(final PluginParameter param) {
+ public ParameterDescriptionEditor(final PluginParameter<?, ?> param) {
parameter = param;
setText(param.getDescription());
getDocument().addDocumentListener(new DocumentListener() {
Modified: trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterTypeEditor.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterTypeEditor.java 2008-10-01 15:35:31 UTC (rev 5307)
+++ trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterTypeEditor.java 2008-10-01 16:02:21 UTC (rev 5308)
@@ -35,7 +35,7 @@
private static final long serialVersionUID = 1L;
- private final PluginParameter parameter;
+ private final PluginParameter<?, ?> parameter;
private final ScriptModel script;
@@ -56,7 +56,7 @@
};
- public ParameterTypeEditor(final ScriptModel script, final PluginParameter parameter) {
+ public ParameterTypeEditor(final ScriptModel script, final PluginParameter<?, ?> parameter) {
super(PluginParameterFactory.getTypes());
this.parameter = parameter;
this.script = script;
Modified: trunk/crossfire/src/cfeditor/gui/script/parameter/PluginParameterViewFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/script/parameter/PluginParameterViewFactory.java 2008-10-01 15:35:31 UTC (rev 5307)
+++ trunk/crossfire/src/cfeditor/gui/script/parameter/PluginParameterViewFactory.java 2008-10-01 16:02:21 UTC (rev 5308)
@@ -115,7 +115,7 @@
}
@NotNull
- public PluginParameterView getView(@NotNull final PluginParameter parameter) {
+ public PluginParameterView getView(@NotNull final PluginParameter<?, ?> parameter) {
view = null;
parameter.visit(visitor);
assert view != null;
Modified: trunk/crossfire/src/cfeditor/script/ScriptController.java
===================================================================
--- trunk/crossfire/src/cfeditor/script/ScriptController.java 2008-10-01 15:35:31 UTC (rev 5307)
+++ trunk/crossfire/src/cfeditor/script/ScriptController.java 2008-10-01 16:02:21 UTC (rev 5308)
@@ -387,7 +387,7 @@
try {
runner.setConsole(console);
scriptParameters.setInterpreterValues(runner, ScriptRunMode.BATCH);
- for (final PluginParameter parameter : model) {
+ for (final PluginParameter<?, ?> parameter : model) {
runner.set(parameter.getName(), parameter.getValue());
}
scriptThread = new BshThread(model.getName());
@@ -540,7 +540,7 @@
if (index == -1) {
final StringBuilder sb = new StringBuilder();
boolean firstParameter = true;
- for (final PluginParameter parameter : model) {
+ for (final PluginParameter<?, ?> parameter : model) {
sb.append(firstParameter ? " " : ", ");
sb.append(parameter.getName());
firstParameter = false;
@@ -548,7 +548,7 @@
throw new ScriptExecException("script " + script + " has no parameter " + tmp[0] + "; available parameters:" + sb);
}
- final PluginParameter parameter;
+ final PluginParameter<?, ?> parameter;
try {
parameter = model.getParameter(index);
} catch (final NoSuchParameterException ex) {
Modified: trunk/src/app/net/sf/gridarta/script/ScriptModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/script/ScriptModel.java 2008-10-01 15:35:31 UTC (rev 5307)
+++ trunk/src/app/net/sf/gridarta/script/ScriptModel.java 2008-10-01 16:02:21 UTC (rev 5308)
@@ -43,7 +43,7 @@
* @author tchize
* @todo documentation
*/
-public final class ScriptModel implements Cloneable, Iterable<PluginParameter> {
+public final class ScriptModel implements Cloneable, Iterable<PluginParameter<?, ?>> {
/** The Logger for printing log messages. */
private static final Logger log = Logger.getLogger(ScriptModel.class);
@@ -56,7 +56,7 @@
private String code = "";
- private final List<PluginParameter> parameters = new ArrayList<PluginParameter>();
+ private final List<PluginParameter<?, ?>> parameters = new ArrayList<PluginParameter<?, ?>>();
private String name = "";
@@ -144,7 +144,7 @@
*/
public int getParameter(@NotNull final String paramName) {
int index = 0;
- for (final PluginParameter param : parameters) {
+ for (final PluginParameter<?, ?> param : parameters) {
if (param.getName().equals(paramName)) {
return index;
}
@@ -159,7 +159,7 @@
}
public void newParameter() {
- final PluginParameter p;
+ final PluginParameter<?, ?> p;
try {
p = PluginParameterFactory.createParameter((String) null);
} catch (final NoSuchParameterException ex) {
@@ -205,8 +205,8 @@
model.name = name;
model.scriptType = scriptType;
model.modified = modified;
- for (final PluginParameter param : parameters) {
- model.addParameter((PluginParameter) param.clone());
+ for (final PluginParameter<?, ?> param : parameters) {
+ model.addParameter((PluginParameter<?, ?>) param.clone());
}
return model;
}
@@ -215,7 +215,7 @@
* Adds a parameter to this script.
* @param p the parameter to add
*/
- public void addParameter(final PluginParameter p) {
+ public void addParameter(final PluginParameter<?, ?> p) {
parameters.add(p);
modified = true;
notifyListeners();
@@ -227,7 +227,7 @@
* getParametersCount(). If index is out of range, result is undefined.
* @return the requested parameter
*/
- public PluginParameter getParameter(final int index) throws NoSuchParameterException {
+ public PluginParameter<?, ?> getParameter(final int index) throws NoSuchParameterException {
try {
return parameters.get(index);
} catch (final IndexOutOfBoundsException ex) {
@@ -318,7 +318,7 @@
final List<Element> params = node.getChildren("parameter");
if (params != null && !params.isEmpty()) {
for (final Element parameter : params) {
- final PluginParameter p;
+ final PluginParameter<?, ?> p;
try {
p = PluginParameterFactory.createParameter(parameter);
} catch (final NoSuchParameterException ex) {
@@ -359,7 +359,7 @@
}
root.addContent(modes);
- for (final PluginParameter parameter : parameters) {
+ for (final PluginParameter<?, ?> parameter : parameters) {
root.addContent(parameter.toXML());
}
return root;
@@ -371,7 +371,7 @@
notifyListeners();
}
- public void convertType(final PluginParameter parameter, final String newType) throws NoSuchParameterException {
+ public void convertType(final PluginParameter<?, ?> parameter, final String newType) throws NoSuchParameterException {
final int index = parameters.indexOf(parameter);
convertType(index, newType);
}
@@ -413,7 +413,7 @@
}
/** {@inheritDoc} */
- public Iterator<PluginParameter> iterator() {
+ public Iterator<PluginParameter<?, ?>> iterator() {
return Collections.unmodifiableList(parameters).iterator();
}
Modified: trunk/src/app/net/sf/gridarta/script/parameter/PluginParameterFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/script/parameter/PluginParameterFactory.java 2008-10-01 15:35:31 UTC (rev 5307)
+++ trunk/src/app/net/sf/gridarta/script/parameter/PluginParameterFactory.java 2008-10-01 16:02:21 UTC (rev 5308)
@@ -56,12 +56,12 @@
}
@Nullable
- public static PluginParameter createParameter(final Element parameterNode) throws NoSuchParameterException {
+ public static PluginParameter<?, ?> createParameter(final Element parameterNode) throws NoSuchParameterException {
return createParameter(parameterNode.getChildText("type"), parameterNode);
}
@NotNull
- public static PluginParameter createParameter(@Nullable final String type) throws NoSuchParameterException {
+ public static PluginParameter<?, ?> createParameter(@Nullable final String type) throws NoSuchParameterException {
final String typeClass = type == null ? "java.lang.String" : type;
final Class<? extends PluginParameter> c = parameterTypes.get(typeClass);
if (c == null) {
@@ -81,7 +81,7 @@
}
@NotNull
- public static PluginParameter createParameter(@Nullable final String type, final Element parameterNode) throws NoSuchParameterException {
+ public static PluginParameter<?, ?> createParameter(@Nullable final String type, final Element parameterNode) throws NoSuchParameterException {
final String typeClass = type == null ? "java.lang.String" : type;
final Class<? extends PluginParameter> c = parameterTypes.get(typeClass);
if (c == null) {
@@ -89,7 +89,7 @@
}
try {
- final PluginParameter p = c.newInstance();
+ final PluginParameter<?, ?> p = c.newInstance();
p.fromXML(parameterNode);
return p;
} catch (final Exception e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
