From: <aki...@us...> - 2008-09-30 21:36:16
|
Revision: 5302 http://gridarta.svn.sourceforge.net/gridarta/?rev=5302&view=rev Author: akirschbaum Date: 2008-09-30 21:35:47 +0000 (Tue, 30 Sep 2008) Log Message: ----------- Remove unused type parameters. Modified Paths: -------------- trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterNameEditor.java trunk/crossfire/src/cfeditor/gui/script/parameter/PluginParameterView.java trunk/src/app/net/sf/gridarta/script/parameter/ArchParameter.java trunk/src/app/net/sf/gridarta/script/parameter/BooleanParameter.java trunk/src/app/net/sf/gridarta/script/parameter/DoubleParameter.java trunk/src/app/net/sf/gridarta/script/parameter/FilterParameter.java trunk/src/app/net/sf/gridarta/script/parameter/IntegerParameter.java trunk/src/app/net/sf/gridarta/script/parameter/MapParameter.java trunk/src/app/net/sf/gridarta/script/parameter/PluginParameter.java trunk/src/app/net/sf/gridarta/script/parameter/StringParameter.java Modified: trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterNameEditor.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterNameEditor.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/crossfire/src/cfeditor/gui/script/parameter/ParameterNameEditor.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -28,7 +28,7 @@ private static final long serialVersionUID = 1L; - private final PluginParameter<?, ?, ?> parameter; + private final PluginParameter<?, ?> parameter; private final DocumentListener documentListener = new DocumentListener() { @@ -49,7 +49,7 @@ }; - public ParameterNameEditor(final PluginParameter<?, ?, ?> parameter) { + public ParameterNameEditor(final PluginParameter<?, ?> parameter) { this.parameter = parameter; setText(parameter.getName()); getDocument().addDocumentListener(documentListener); Modified: trunk/crossfire/src/cfeditor/gui/script/parameter/PluginParameterView.java =================================================================== --- trunk/crossfire/src/cfeditor/gui/script/parameter/PluginParameterView.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/crossfire/src/cfeditor/gui/script/parameter/PluginParameterView.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -27,7 +27,7 @@ * Interface for Views that display plugin parameters. * @author tchize */ -public interface PluginParameterView<V, C, P extends PluginParameter<V, C, P>> { +public interface PluginParameterView<V, C, P extends PluginParameter<V, C>> { JComponent getValueComponent(V value, P parameter); Modified: trunk/src/app/net/sf/gridarta/script/parameter/ArchParameter.java =================================================================== --- trunk/src/app/net/sf/gridarta/script/parameter/ArchParameter.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/src/app/net/sf/gridarta/script/parameter/ArchParameter.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -26,7 +26,7 @@ import org.jdom.Element; import org.jetbrains.annotations.NotNull; -public class ArchParameter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends PluginParameter<R, Void, ArchParameter<G, A, R>> { +public class ArchParameter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends PluginParameter<R, Void> { @NotNull private static ArchetypeSet<?, ?, ?> archetypeSet; Modified: trunk/src/app/net/sf/gridarta/script/parameter/BooleanParameter.java =================================================================== --- trunk/src/app/net/sf/gridarta/script/parameter/BooleanParameter.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/src/app/net/sf/gridarta/script/parameter/BooleanParameter.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -22,7 +22,7 @@ import org.jdom.Element; import org.jetbrains.annotations.NotNull; -public class BooleanParameter extends PluginParameter<Boolean, BooleanConfig, BooleanParameter> { +public class BooleanParameter extends PluginParameter<Boolean, BooleanConfig> { public BooleanParameter() { super(getParameterType()); Modified: trunk/src/app/net/sf/gridarta/script/parameter/DoubleParameter.java =================================================================== --- trunk/src/app/net/sf/gridarta/script/parameter/DoubleParameter.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/src/app/net/sf/gridarta/script/parameter/DoubleParameter.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -22,7 +22,7 @@ import org.jdom.Element; import org.jetbrains.annotations.NotNull; -public class DoubleParameter extends PluginParameter<Double, DoubleConfig, DoubleParameter> { +public class DoubleParameter extends PluginParameter<Double, DoubleConfig> { public DoubleParameter() { super(getParameterType()); Modified: trunk/src/app/net/sf/gridarta/script/parameter/FilterParameter.java =================================================================== --- trunk/src/app/net/sf/gridarta/script/parameter/FilterParameter.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/src/app/net/sf/gridarta/script/parameter/FilterParameter.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -25,7 +25,7 @@ import org.jdom.Element; import org.jetbrains.annotations.NotNull; -public class FilterParameter extends PluginParameter<FilterConfig, Void, FilterParameter> { +public class FilterParameter extends PluginParameter<FilterConfig, Void> { private final NamedFilterList defaultFilterList; Modified: trunk/src/app/net/sf/gridarta/script/parameter/IntegerParameter.java =================================================================== --- trunk/src/app/net/sf/gridarta/script/parameter/IntegerParameter.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/src/app/net/sf/gridarta/script/parameter/IntegerParameter.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -22,7 +22,7 @@ import org.jdom.Element; import org.jetbrains.annotations.NotNull; -public class IntegerParameter extends PluginParameter<Integer, IntegerConfig, IntegerParameter> { +public class IntegerParameter extends PluginParameter<Integer, IntegerConfig> { public IntegerParameter() { super(getParameterType()); Modified: trunk/src/app/net/sf/gridarta/script/parameter/MapParameter.java =================================================================== --- trunk/src/app/net/sf/gridarta/script/parameter/MapParameter.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/src/app/net/sf/gridarta/script/parameter/MapParameter.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -28,7 +28,7 @@ import org.jdom.Element; import org.jetbrains.annotations.NotNull; -public class MapParameter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends PluginParameter<Object, Void, MapParameter<G, A, R, V>> { // XXX: find correct parameter type: String or MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> +public class MapParameter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends PluginParameter<Object, Void> { // XXX: find correct parameter type: String or MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> @NotNull private static MapManager<?, ?, ?, ?> mapManager; Modified: trunk/src/app/net/sf/gridarta/script/parameter/PluginParameter.java =================================================================== --- trunk/src/app/net/sf/gridarta/script/parameter/PluginParameter.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/src/app/net/sf/gridarta/script/parameter/PluginParameter.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -31,7 +31,7 @@ * Parameter for a Plugin. * @author tchize */ -public abstract class PluginParameter<V, C, Q extends PluginParameter<V, C, Q>> implements Cloneable { +public abstract class PluginParameter<V, C> implements Cloneable { private V value; Modified: trunk/src/app/net/sf/gridarta/script/parameter/StringParameter.java =================================================================== --- trunk/src/app/net/sf/gridarta/script/parameter/StringParameter.java 2008-09-30 21:28:47 UTC (rev 5301) +++ trunk/src/app/net/sf/gridarta/script/parameter/StringParameter.java 2008-09-30 21:35:47 UTC (rev 5302) @@ -23,7 +23,7 @@ import org.jdom.Element; import org.jetbrains.annotations.NotNull; -public class StringParameter extends PluginParameter<String, Void, StringParameter> { +public class StringParameter extends PluginParameter<String, Void> { /** The Logger for printing log messages. */ private static final Logger log = Logger.getLogger(StringParameter.class); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |