Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[9361] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/gameobjectattributes
|
From: <aki...@us...> - 2013-07-19 06:49:00
|
Revision: 9361
http://sourceforge.net/p/gridarta/code/9361
Author: akirschbaum
Date: 2013-07-19 06:48:57 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
Simplify code.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeAnimationName.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBool.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBoolSpec.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFaceName.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFloat.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInt.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInvSpell.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeList.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeLong.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeMapPath.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeScriptFile.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeSpell.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeString.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeTreasure.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeZSpell.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -74,9 +74,17 @@
public abstract void appendSummary(@NotNull final Document doc, @NotNull final Style style);
- protected static void addLine(@NotNull final Document doc, @NotNull final AttributeSet style, @NotNull final String line) {
+ /**
+ * Appends a line to a {@link Document}. The line consists of the name of
+ * this attribute, possibly with some text prepended and/or appended.
+ * @param doc the document to add to
+ * @param style the style for the new text
+ * @param prefix the text to prepend; may be empty
+ * @param postfix the text to append; may be empty
+ */
+ protected void addLine(@NotNull final Document doc, @NotNull final AttributeSet style, @NotNull final String prefix, @NotNull final String postfix) {
try {
- doc.insertString(doc.getLength(), line + "\n", style);
+ doc.insertString(doc.getLength(), prefix + ref.getAttributeName() + postfix + "\n", style);
} catch (final BadLocationException e) {
log.error("toggleSummary: Bad Location in Document!", e);
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeAnimationName.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeAnimationName.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeAnimationName.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -71,7 +71,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getAnimName();
if (!value.isEmpty()) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -98,7 +98,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String tmp = input.getText().trim();
if (!tmp.isEmpty() && !tmp.startsWith("<")) {
- addLine(doc, style, getRef().getAttributeName() + " = " + tmp);
+ addLine(doc, style, "", " = " + tmp);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBool.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBool.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBool.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -72,7 +72,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final boolean value = input.isSelected();
if (value) {
- addLine(doc, style, "<" + getRef().getAttributeName() + ">");
+ addLine(doc, style, "<" , ">");
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBoolSpec.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBoolSpec.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBoolSpec.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -78,7 +78,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final boolean value = input.isSelected();
if (value) {
- addLine(doc, style, "<" + getRef().getAttributeName() + ">");
+ addLine(doc, style, "<", ">");
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFaceName.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFaceName.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFaceName.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -71,7 +71,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getFaceName();
if (!value.isEmpty()) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFloat.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFloat.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFloat.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -86,7 +86,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getText();
if (value != null && !value.isEmpty() && !value.equals("0")) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInt.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInt.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInt.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -95,7 +95,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getText();
if (value != null && !value.isEmpty() && !value.equals("0")) {
- addLine(doc, style, ref.getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInvSpell.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInvSpell.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInvSpell.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -132,7 +132,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getSelectedItem().toString().trim();
if (!value.isEmpty() && !value.startsWith("<")) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeList.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeList.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeList.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -82,7 +82,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getSelectedItem().toString().trim();
if (!value.isEmpty() && !value.startsWith("<")) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeLong.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeLong.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeLong.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -83,7 +83,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getText();
if (value != null && !value.isEmpty() && !value.equals("0")) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeMapPath.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeMapPath.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeMapPath.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -71,7 +71,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getText();
if (value != null && !value.isEmpty()) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeScriptFile.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeScriptFile.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeScriptFile.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -71,7 +71,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getText();
if (value != null && !value.isEmpty()) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeSpell.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeSpell.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeSpell.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -82,7 +82,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getSelectedItem().toString().trim();
if (!value.isEmpty() && !value.startsWith("<")) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeString.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeString.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeString.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -73,7 +73,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getText();
if (value != null && !value.isEmpty()) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeTreasure.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeTreasure.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeTreasure.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -96,7 +96,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getText().trim();
if (!value.isEmpty() && !value.equals(CFTreasureListTree.NONE_SYM)) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeZSpell.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeZSpell.java 2013-07-19 06:37:44 UTC (rev 9360)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeZSpell.java 2013-07-19 06:48:57 UTC (rev 9361)
@@ -88,7 +88,7 @@
public void appendSummary(@NotNull final Document doc, @NotNull final Style style) {
final String value = input.getSelectedItem().toString().trim();
if (!value.isEmpty() && !value.startsWith("<")) {
- addLine(doc, style, getRef().getAttributeName() + " = " + value);
+ addLine(doc, style, "", " = " + value);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
