From: <aki...@us...> - 2014-02-22 08:54:04
|
Revision: 9613 http://sourceforge.net/p/gridarta/code/9613 Author: akirschbaum Date: 2014-02-22 08:53:58 +0000 (Sat, 22 Feb 2014) Log Message: ----------- Do not extend JTextField. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java Removed Paths: ------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.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:47:03 UTC (rev 9612) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-02-22 08:53:58 UTC (rev 9613) @@ -43,13 +43,14 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTabbedPane; +import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; +import javax.swing.text.JTextComponent; import net.sf.gridarta.gui.dialog.plugin.parameter.ParameterDescriptionEditor; -import net.sf.gridarta.gui.dialog.plugin.parameter.ParameterNameEditor; import net.sf.gridarta.gui.dialog.plugin.parameter.PluginParameterView; import net.sf.gridarta.gui.dialog.plugin.parameter.PluginParameterViewFactory; import net.sf.gridarta.model.archetype.Archetype; @@ -107,7 +108,7 @@ private final Plugin<G, A, R> plugin; @NotNull - private final Map<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>> parameterNameEditors = new IdentityHashMap<PluginParameter<G, A, R, ?>, ParameterNameEditor<G, A, R>>(); + private final Map<PluginParameter<G, A, R, ?>, Component> parameterNameEditors = new IdentityHashMap<PluginParameter<G, A, R, ?>, Component>(); @NotNull private final Map<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>> parameterDescriptionEditors = new IdentityHashMap<PluginParameter<G, A, R, ?>, ParameterDescriptionEditor<G, A, R>>(); @@ -359,7 +360,32 @@ return existingParameterNameEditor; } - final ParameterNameEditor<G, A, R> newParameterNameEditor = new ParameterNameEditor<G, A, R>(parameter); + final JTextComponent newParameterNameEditor = new JTextField(parameter.getName()); + newParameterNameEditor.getDocument().addDocumentListener(new DocumentListener() { + + @Override + public void insertUpdate(@NotNull final DocumentEvent e) { + change(); + } + + @Override + public void removeUpdate(@NotNull final DocumentEvent e) { + change(); + } + + @Override + public void changedUpdate(@NotNull final DocumentEvent e) { + change(); + } + + /** + * Updates the {@code parameter}'s name from the text input field. + */ + private void change() { + parameter.setName(newParameterNameEditor.getText()); + } + + }); parameterNameEditors.put(parameter, newParameterNameEditor); newTableComponent(newParameterNameEditor); return newParameterNameEditor; Deleted: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java 2014-02-22 07:47:03 UTC (rev 9612) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java 2014-02-22 08:53:58 UTC (rev 9613) @@ -1,61 +0,0 @@ -/* - * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games. - * Copyright (C) 2000-2011 The Gridarta Developers. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -package net.sf.gridarta.gui.dialog.plugin.parameter; - -import javax.swing.JTextField; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; -import net.sf.gridarta.model.archetype.Archetype; -import net.sf.gridarta.model.gameobject.GameObject; -import net.sf.gridarta.model.maparchobject.MapArchObject; -import net.sf.gridarta.plugin.parameter.PluginParameter; -import org.jetbrains.annotations.NotNull; - -public class ParameterNameEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JTextField { - - private static final long serialVersionUID = 1L; - - public ParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) { - setText(parameter.getName()); - getDocument().addDocumentListener(new DocumentListener() { - - @Override - public void insertUpdate(@NotNull final DocumentEvent e) { - change(); - } - - @Override - public void removeUpdate(@NotNull final DocumentEvent e) { - change(); - } - - @Override - public void changedUpdate(@NotNull final DocumentEvent e) { - change(); - } - - private void change() { - parameter.setName(getText()); - } - - }); - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |