Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4577] trunk
|
From: <aki...@us...> - 2008-07-29 20:07:15
|
Revision: 4577
http://gridarta.svn.sourceforge.net/gridarta/?rev=4577&view=rev
Author: akirschbaum
Date: 2008-07-29 20:07:21 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Rename BitmaskAttrib to DialogAttribBitmask.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/archtype/CAttribBitmask.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/MaskChangeAL.java
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java
Removed Paths:
-------------
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java
Modified: trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-29 08:30:43 UTC (rev 4576)
+++ trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-29 20:07:21 UTC (rev 4577)
@@ -42,8 +42,8 @@
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.gameobjectattributesdialog.AbstractGameObjectAttributesDialog;
import net.sf.gridarta.gui.gameobjectattributesdialog.AbstractGameObjectAttributesDialogFactory;
-import net.sf.gridarta.gui.gameobjectattributesdialog.BitmaskAttrib;
import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttrib;
+import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttribBitmask;
import net.sf.gridarta.gui.gameobjectattributesdialog.StringKeyManager;
import net.sf.gridarta.gui.map.TilePanel;
import net.sf.gridarta.spells.GameObjectSpell;
@@ -389,7 +389,7 @@
break;
case BITMASK: {
// a bitmask attribute (similar to integer, but easier because no parsing needed)
- final String value = ((BitmaskAttrib) attr).getEncodedValue(); // get bitmask value
+ final String value = ((DialogAttribBitmask) attr).getEncodedValue(); // get bitmask value
String oldValue = archetype.getAttributeString(attr.ref.getNameOld());
if (oldValue.length() == 0) {
oldValue = "0";
Modified: trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-29 08:30:43 UTC (rev 4576)
+++ trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-29 20:07:21 UTC (rev 4577)
@@ -42,8 +42,8 @@
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.gameobjectattributesdialog.AbstractGameObjectAttributesDialog;
import net.sf.gridarta.gui.gameobjectattributesdialog.AbstractGameObjectAttributesDialogFactory;
-import net.sf.gridarta.gui.gameobjectattributesdialog.BitmaskAttrib;
import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttrib;
+import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttribBitmask;
import net.sf.gridarta.gui.gameobjectattributesdialog.StringKeyManager;
import net.sf.gridarta.gui.map.TilePanel;
import net.sf.gridarta.spells.NumberSpell;
@@ -318,7 +318,7 @@
break;
case BITMASK: {
// a bitmask attribute (similar to integer, but easier because no parsing needed)
- final String value = ((BitmaskAttrib) attr).getEncodedValue(); // get bitmask value
+ final String value = ((DialogAttribBitmask) attr).getEncodedValue(); // get bitmask value
String oldValue = archetype.getAttributeString(attr.ref.getNameOld());
if (oldValue.length() == 0) {
oldValue = "0";
Modified: trunk/src/app/net/sf/gridarta/archtype/CAttribBitmask.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/CAttribBitmask.java 2008-07-29 08:30:43 UTC (rev 4576)
+++ trunk/src/app/net/sf/gridarta/archtype/CAttribBitmask.java 2008-07-29 20:07:21 UTC (rev 4577)
@@ -31,7 +31,7 @@
import javax.swing.JPanel;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpressionException;
-import net.sf.gridarta.gui.gameobjectattributesdialog.BitmaskAttrib;
+import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttribBitmask;
import net.sf.gridarta.utils.WrappingStringBuilder;
import net.sf.japi.xml.NodeListIterator;
import org.apache.log4j.Logger;
@@ -319,7 +319,7 @@
* the dialog
*/
@Nullable
- public Integer showBitmaskDialog(final Component parentComponent, final BitmaskAttrib guiAttr) {
+ public Integer showBitmaskDialog(final Component parentComponent, final DialogAttribBitmask guiAttr) {
final String title = "Choose " + guiAttr.ref.getNameNew().substring(0, 1).toUpperCase() + guiAttr.ref.getNameNew().substring(1);
final JPanel gridPanel = new JPanel(new GridLayout(0, 2, 3, 3));
final JCheckBox[] checkbox = new JCheckBox[number];
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-07-29 08:30:43 UTC (rev 4576)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-07-29 20:07:21 UTC (rev 4577)
@@ -812,7 +812,7 @@
break;
case BITMASK: {
final JTextArea input = new JTextArea();
- final BitmaskAttrib tmpAttr = new BitmaskAttrib(attrib, input);
+ final DialogAttribBitmask tmpAttr = new DialogAttribBitmask(attrib, input);
if (attrib.getMisc() != null && archetypeTypeSet.getBitmaskTable().containsKey(attrib.getMisc()[0])) {
// fetch the bitmask data, then build the attribute panel
final CAttribBitmask bitmask = archetypeTypeSet.getBitmaskTable().get(attrib.getMisc()[0]);
Deleted: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java 2008-07-29 08:30:43 UTC (rev 4576)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java 2008-07-29 20:07:21 UTC (rev 4577)
@@ -1,80 +0,0 @@
-package net.sf.gridarta.gui.gameobjectattributesdialog;
-
-import javax.swing.text.JTextComponent;
-import net.sf.gridarta.archtype.ArchetypeAttribute;
-import net.sf.gridarta.archtype.CAttribBitmask;
-import org.apache.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * DialogAttrib for types with bitmasks to choose from.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- */
-public final class BitmaskAttrib extends DialogAttrib<JTextComponent> {
-
- /** The Logger for printing log messages. */
- private static final Logger log = Logger.getLogger(BitmaskAttrib.class);
-
- /** Active bitmask value. */
- private int value;
-
- /** Reference to the bitmask data. */
- private CAttribBitmask bitmask;
-
- /**
- * Create a BitmaskAttrib.
- * @param ref reference to the attribute data
- * @param input Input ui component for editing the value.
- */
- public BitmaskAttrib(@NotNull final ArchetypeAttribute ref, @NotNull final JTextComponent input) {
- super(ref, input);
- }
-
- /**
- * Get the active bitmask value.
- * @return active bitmask value
- */
- public int getValue() {
- return value;
- }
-
- /**
- * Get the active bitmask value in external file representation.
- * @return active bitmask value in external file representation
- */
- public String getEncodedValue() {
- return bitmask.encodeValue(value);
- }
-
- /**
- * Set the active bitmask value.
- * @param value new active bitmask value
- */
- public void setValue(final int value) {
- this.value = value;
- if (bitmask != null) {
- getInput().setText(bitmask.getText(value));
- } else {
- log.warn("null bitmask");
- }
- }
-
- /**
- * Set the active bitmask value in external file representation.
- * @param encodedValue new active bitmask value in external file
- * representation
- */
- public void setEncodedValue(final String encodedValue) {
- assert bitmask != null;
- setValue(bitmask.decodeValue(encodedValue));
- }
-
- public CAttribBitmask getBitmask() {
- return bitmask;
- }
-
- public void setBitmask(final CAttribBitmask bitmask) {
- this.bitmask = bitmask;
- }
-
-} // class BitmaskAttrib
Copied: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java (from rev 4576, trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java)
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java 2008-07-29 20:07:21 UTC (rev 4577)
@@ -0,0 +1,80 @@
+package net.sf.gridarta.gui.gameobjectattributesdialog;
+
+import javax.swing.text.JTextComponent;
+import net.sf.gridarta.archtype.ArchetypeAttribute;
+import net.sf.gridarta.archtype.CAttribBitmask;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * DialogAttrib for types with bitmasks to choose from.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public final class DialogAttribBitmask extends DialogAttrib<JTextComponent> {
+
+ /** The Logger for printing log messages. */
+ private static final Logger log = Logger.getLogger(DialogAttribBitmask.class);
+
+ /** Active bitmask value. */
+ private int value;
+
+ /** Reference to the bitmask data. */
+ private CAttribBitmask bitmask;
+
+ /**
+ * Create a BitmaskAttrib.
+ * @param ref reference to the attribute data
+ * @param input Input ui component for editing the value.
+ */
+ public DialogAttribBitmask(@NotNull final ArchetypeAttribute ref, @NotNull final JTextComponent input) {
+ super(ref, input);
+ }
+
+ /**
+ * Get the active bitmask value.
+ * @return active bitmask value
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Get the active bitmask value in external file representation.
+ * @return active bitmask value in external file representation
+ */
+ public String getEncodedValue() {
+ return bitmask.encodeValue(value);
+ }
+
+ /**
+ * Set the active bitmask value.
+ * @param value new active bitmask value
+ */
+ public void setValue(final int value) {
+ this.value = value;
+ if (bitmask != null) {
+ getInput().setText(bitmask.getText(value));
+ } else {
+ log.warn("null bitmask");
+ }
+ }
+
+ /**
+ * Set the active bitmask value in external file representation.
+ * @param encodedValue new active bitmask value in external file
+ * representation
+ */
+ public void setEncodedValue(final String encodedValue) {
+ assert bitmask != null;
+ setValue(bitmask.decodeValue(encodedValue));
+ }
+
+ public CAttribBitmask getBitmask() {
+ return bitmask;
+ }
+
+ public void setBitmask(final CAttribBitmask bitmask) {
+ this.bitmask = bitmask;
+ }
+
+} // class DialogAttribBitmask
Property changes on: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:mergeinfo
+
Added: svn:eol-style
+ LF
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/MaskChangeAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/MaskChangeAL.java 2008-07-29 08:30:43 UTC (rev 4576)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/MaskChangeAL.java 2008-07-29 20:07:21 UTC (rev 4577)
@@ -12,7 +12,7 @@
/** The serial version UID. */
private static final long serialVersionUID = 1;
- private final BitmaskAttrib bmAttr; // attribute structure
+ private final DialogAttribBitmask bmAttr; // attribute structure
/**
* Constructor.
@@ -20,7 +20,7 @@
* @param newAttr the GUI-bitmask attribute where the change button belongs
* to
*/
- public MaskChangeAL(final String label, final BitmaskAttrib newAttr) {
+ public MaskChangeAL(final String label, final DialogAttribBitmask newAttr) {
super(label);
bmAttr = newAttr;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
