Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[9615] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin
|
From: <aki...@us...> - 2014-02-22 09:15:53
|
Revision: 9615
http://sourceforge.net/p/gridarta/code/9615
Author: akirschbaum
Date: 2014-02-22 09:15:47 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
Remove type parameters from PluginParameterView.
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/PluginView.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/IntegerParameterView.java
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/MapPathParameterView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.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 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -116,7 +116,7 @@
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 IdentityHashMap<PluginParameter<G, A, R, ?>, PluginParameterView<G, A, R>>();
+ private final Map<PluginParameter<G, A, R, ?>, PluginParameterView> parameterViews = new IdentityHashMap<PluginParameter<G, A, R, ?>, PluginParameterView>();
private int selectedRow = -1;
@@ -463,13 +463,13 @@
}
@NotNull
- private PluginParameterView<G, A, R> getParameterView(@NotNull final PluginParameter<G, A, R, ?> parameter) {
- final PluginParameterView<G, A, R> existingPluginParameterView = parameterViews.get(parameter);
+ private PluginParameterView getParameterView(@NotNull final PluginParameter<G, A, R, ?> parameter) {
+ final PluginParameterView existingPluginParameterView = parameterViews.get(parameter);
if (existingPluginParameterView != null) {
return existingPluginParameterView;
}
- final PluginParameterView<G, A, R> newPluginParameterView = pluginParameterViewFactory.getView(parameterTable, parameter);
+ final PluginParameterView newPluginParameterView = pluginParameterViewFactory.getView(parameterTable, parameter);
newTableComponent(newPluginParameterView.getConfigComponent());
newTableComponent(newPluginParameterView.getValueComponent());
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginView.java 2014-02-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginView.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -225,7 +225,7 @@
int i = 0;
for (final PluginParameter<G, A, R, ?> parameter : plugin) {
final Component name = new JLabel(parameter.getName());
- final PluginParameterView<G, A, R> view = pluginParameterViewFactory.getView(panel, parameter);
+ final PluginParameterView view = pluginParameterViewFactory.getView(panel, parameter);
final JComponent val = view.getValueComponent();
val.setToolTipText(parameter.getDescription());
final GridBagConstraints gn = new GridBagConstraints(0, i, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 5, 5);
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-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -38,7 +38,7 @@
/**
* A {@link PluginParameterView} for an {@link ArchetypeParameter}.
*/
-public class ArchParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
+public class ArchParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView {
/**
* The component for editing the parameter's value.
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-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -35,7 +35,7 @@
/**
* A {@link PluginParameterView} for an {@link BooleanParameter}.
*/
-public class BooleanParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
+public class BooleanParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView {
/**
* The component for editing the parameter's value.
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-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -38,7 +38,7 @@
/**
* A {@link PluginParameterView} for a {@link DoubleParameter}.
*/
-public class DoubleParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
+public class DoubleParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView {
/**
* The {@link DoubleParameter} that is shown.
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java 2014-02-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -38,7 +38,7 @@
/**
* A {@link PluginParameterView} for an {@link IntegerParameter}.
*/
-public class IntegerParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
+public class IntegerParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView {
/**
* The {@link IntegerParameter} that is shown.
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-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -36,7 +36,7 @@
/**
* A {@link PluginParameterView} for a {@link MapParameter}.
*/
-public class MapParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
+public class MapParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView {
/**
* The component for editing the parameter's value.
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java 2014-02-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapPathParameterView.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -37,7 +37,7 @@
* net.sf.gridarta.plugin.parameter.MapPathParameter}.
* @author Andreas Kirschbaum
*/
-public class MapPathParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
+public class MapPathParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView {
/**
* The component for editing the parameter's value.
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java 2014-02-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -20,16 +20,13 @@
package net.sf.gridarta.gui.dialog.plugin.parameter;
import javax.swing.JComponent;
-import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.maparchobject.MapArchObject;
import org.jetbrains.annotations.NotNull;
/**
* Interface for views that display plugin parameters.
* @author tchize
*/
-public interface PluginParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
+public interface PluginParameterView {
/**
* Returns a {@link JComponent} for editing the parameter value. In the "run
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java 2014-02-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -71,48 +71,48 @@
private JComponent parent;
@NotNull
- private final PluginParameterVisitor<G, A, R, PluginParameterView<G, A, R>> visitor = new PluginParameterVisitor<G, A, R, PluginParameterView<G, A, R>>() {
+ private final PluginParameterVisitor<G, A, R, PluginParameterView> visitor = new PluginParameterVisitor<G, A, R, PluginParameterView>() {
@NotNull
@Override
- public PluginParameterView<G, A, R> visit(@NotNull final ArchetypeParameter<G, A, R> parameter) {
+ public PluginParameterView visit(@NotNull final ArchetypeParameter<G, A, R> parameter) {
return new ArchParameterView<G, A, R>(parameter, gameObjectAttributesModel, archetypeSet, objectChooser, faceObjectProviders);
}
@NotNull
@Override
- public PluginParameterView<G, A, R> visit(@NotNull final BooleanParameter<G, A, R> parameter) {
+ public PluginParameterView visit(@NotNull final BooleanParameter<G, A, R> parameter) {
return new BooleanParameterView<G, A, R>(parameter);
}
@NotNull
@Override
- public PluginParameterView<G, A, R> visit(@NotNull final DoubleParameter<G, A, R> parameter) {
+ public PluginParameterView visit(@NotNull final DoubleParameter<G, A, R> parameter) {
return new DoubleParameterView<G, A, R>(parameter);
}
@NotNull
@Override
- public PluginParameterView<G, A, R> visit(@NotNull final IntegerParameter<G, A, R> parameter) {
+ public PluginParameterView visit(@NotNull final IntegerParameter<G, A, R> parameter) {
return new IntegerParameterView<G, A, R>(parameter);
}
@NotNull
@Override
- public PluginParameterView<G, A, R> visit(@NotNull final MapParameter<G, A, R> parameter) {
+ public PluginParameterView visit(@NotNull final MapParameter<G, A, R> parameter) {
return new MapParameterView<G, A, R>(parameter, mapManager);
}
@NotNull
@Override
- public PluginParameterView<G, A, R> visit(@NotNull final MapPathParameter<G, A, R> parameter) {
+ public PluginParameterView visit(@NotNull final MapPathParameter<G, A, R> parameter) {
assert parent != null;
return new MapPathParameterView<G, A, R>(parent, parameter);
}
@NotNull
@Override
- public PluginParameterView<G, A, R> visit(@NotNull final StringParameter<G, A, R> parameter) {
+ public PluginParameterView visit(@NotNull final StringParameter<G, A, R> parameter) {
return new StringParameterView<G, A, R>(parameter);
}
@@ -135,7 +135,7 @@
* @param parent the parent component for showing dialogs
*/
@NotNull
- public PluginParameterView<G, A, R> getView(@NotNull final JComponent parent, @NotNull final PluginParameter<G, A, R, ?> parameter) {
+ public PluginParameterView getView(@NotNull final JComponent parent, @NotNull final PluginParameter<G, A, R, ?> parameter) {
this.parent = parent;
try {
return parameter.visit(visitor);
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java 2014-02-22 08:59:46 UTC (rev 9614)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java 2014-02-22 09:15:47 UTC (rev 9615)
@@ -34,7 +34,7 @@
/**
* A {@link PluginParameterView} for a {@link StringParameter}.
*/
-public class StringParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView<G, A, R> {
+public class StringParameterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements PluginParameterView {
/**
* The component for editing the parameter's value.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
