Menu
▾
▴
gridarta-commit — svn commit digest list (high traffic)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(103) |
Jun
(121) |
Jul
(16) |
Aug
(67) |
Sep
(126) |
Oct
(161) |
Nov
(164) |
Dec
(588) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(394) |
Feb
(181) |
Mar
(131) |
Apr
(180) |
May
(255) |
Jun
(11) |
Jul
(79) |
Aug
(70) |
Sep
(274) |
Oct
(138) |
Nov
(195) |
Dec
(8) |
| 2008 |
Jan
(3) |
Feb
(142) |
Mar
(162) |
Apr
(124) |
May
(148) |
Jun
(157) |
Jul
(425) |
Aug
(373) |
Sep
(264) |
Oct
(315) |
Nov
(225) |
Dec
(6) |
| 2009 |
Jan
(67) |
Feb
(78) |
Mar
(279) |
Apr
(294) |
May
(92) |
Jun
(65) |
Jul
(134) |
Aug
(41) |
Sep
(138) |
Oct
(125) |
Nov
(126) |
Dec
(122) |
| 2010 |
Jan
(15) |
Feb
(48) |
Mar
(9) |
Apr
(195) |
May
(373) |
Jun
(507) |
Jul
(42) |
Aug
(16) |
Sep
(38) |
Oct
(81) |
Nov
(64) |
Dec
(18) |
| 2011 |
Jan
(13) |
Feb
(12) |
Mar
(39) |
Apr
(1) |
May
(2) |
Jun
(27) |
Jul
(27) |
Aug
(31) |
Sep
(14) |
Oct
(102) |
Nov
(20) |
Dec
(37) |
| 2012 |
Jan
(22) |
Feb
(1) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(18) |
Jul
(6) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(47) |
Jun
(7) |
Jul
(107) |
Aug
|
Sep
|
Oct
(112) |
Nov
(31) |
Dec
(17) |
| 2014 |
Jan
(29) |
Feb
(111) |
Mar
(34) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(18) |
Dec
(10) |
|
From: <aki...@us...> - 2013-06-02 18:00:14
|
Revision: 9260
http://sourceforge.net/p/gridarta/code/9260
Author: akirschbaum
Date: 2013-06-02 18:00:10 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
Whitespace changes.
Modified Paths:
--------------
trunk/src/crossfire/src/main/resources/resource/conf/types.xml
Modified: trunk/src/crossfire/src/main/resources/resource/conf/types.xml
===================================================================
--- trunk/src/crossfire/src/main/resources/resource/conf/types.xml 2013-06-01 13:10:50 UTC (rev 9259)
+++ trunk/src/crossfire/src/main/resources/resource/conf/types.xml 2013-06-02 18:00:10 UTC (rev 9260)
@@ -451,19 +451,24 @@
If defined, then the object will take this name when identified.
</attribute>
<attribute arch="identified_name_pl" editor="identified_name_pl" type="string">
- If defined, then the object will take this plural name when identified.
+ If defined, then the object will take this plural name when
+ identified.
</attribute>
<attribute arch="identified_face" editor="identified image" type="facename">
- If defined, then the object will take this appareance when identified.
+ If defined, then the object will take this appareance when
+ identified.
</attribute>
<attribute arch="identified_anim_random" editor="identified random animation?" type="bool">
- If defined, then the object's animation is in a random sequence when identified.
+ If defined, then the object's animation is in a random sequence when
+ identified.
</attribute>
<attribute arch="identified_anim_speed" editor="identified animation speed" type="float">
- If defined, then the object will have this animation speed when identified.
+ If defined, then the object will have this animation speed when
+ identified.
</attribute>
<attribute arch="identified_animation" editor="identified animation" type="animname">
- If defined, then the object will take this animation when identified.
+ If defined, then the object will take this animation when
+ identified.
</attribute>
<attribute arch="nrof" editor="number" type="int">
This value determines the number of objects in one stack (for
@@ -1205,7 +1210,7 @@
maps. It exists in two types: to add things, or to remove things.]]>
</description>
<attribute arch="subtype" editor="builder type" type="list_builder_type">
- Whether this builder will add items, or remove items.
+ Whether this builder will add items, or remove items.
</attribute>
<attribute arch="unique" editor="unique item" type="bool">
Unique items exist only one time on a server. If the item is taken,
@@ -1232,7 +1237,7 @@
builder. They can put walls, doors, buttons, and such.]]>
</description>
<attribute arch="subtype" editor="builder type" type="list_material_type">
- What kind of building material this is.
+ What kind of building material this is.
</attribute>
<attribute arch="unique" editor="unique item" type="bool">
Unique items exist only one time on a server. If the item is taken,
@@ -1554,9 +1559,9 @@
of uses> 1 (-> one-time usage).
</attribute>
<attribute arch="slaying" editor="name of creation" type="string">
- The created object will bear the name specified in <name
- of creation>, and not use any title. If nothing is set, the standard name and title of
- the archetype are used.
+ The created object will bear the name specified in <name of
+ creation>, and not use any title. If nothing is set, the standard
+ name and title of the archetype are used.
</attribute>
<attribute arch="level" editor="level of creation" type="int" min="-32768" max="32767" check_min="0" check_max="115">
The created object will be of that level. If zero/unset, the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-06-01 13:10:54
|
Revision: 9259
http://sourceforge.net/p/gridarta/code/9259
Author: akirschbaum
Date: 2013-06-01 13:10:50 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Rename identifiers.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GuiInfo.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java 2013-06-01 12:11:21 UTC (rev 9258)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java 2013-06-01 13:10:50 UTC (rev 9259)
@@ -426,26 +426,26 @@
public void visit(@NotNull final ArchetypeAttributeBitmask archetypeAttribute) {
final JTextArea input = new JTextArea();
final DialogAttributeBitmask<G, A, R> tmpAttribute = new DialogAttributeBitmask<G, A, R>(archetypeAttribute, input);
- @Nullable final JTextArea cComp;
- @Nullable final JButton cLabel;
- @Nullable final JLabel cRow;
+ @Nullable final JTextArea component;
+ @Nullable final JButton label;
+ @Nullable final JLabel row;
final AttributeBitmask bitmask = archetypeTypeSet.getBitmask(archetypeAttribute.getBitmaskName());
if (bitmask != null) {
tmpAttribute.setBitmask(bitmask);
- cLabel = new JButton(new MaskChangeAL<G, A, R>(archetypeAttribute.getAttributeName() + ":", tmpAttribute));
+ label = new JButton(new MaskChangeAL<G, A, R>(archetypeAttribute.getAttributeName() + ":", tmpAttribute));
input.setBackground(getBackground());
input.setEditable(false);
input.setBorder(BorderFactory.createLineBorder(Color.gray));
input.setText(bitmask.getText(tmpAttribute.getValue()));
- cComp = input;
+ component = input;
tmpAttribute.setEncodedValue(gameObject.getAttributeString(archetypeAttribute.getArchetypeAttributeName()));
- cRow = null;
+ row = null;
} else {
- cLabel = null;
- cComp = null;
- cRow = new JLabel("Error: Undefined Bitmask");
+ label = null;
+ component = null;
+ row = new JLabel("Error: Undefined Bitmask");
}
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeBitmask>(tmpAttribute, cLabel, cComp, cRow, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeBitmask>(tmpAttribute, label, component, row, null, false);
}
@Override
@@ -472,8 +472,8 @@
final String attributeName = archetypeAttribute.getArchetypeAttributeName();
final String defaultText = gameObject.getAttributeString(attributeName);
final FaceComponent input = new FaceComponent(defaultText, faceObjects, faceObjectProviders, noFaceSquareIcon, unknownSquareIcon);
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ":");
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeFaceName>(new DialogAttributeFaceName<G, A, R>(archetypeAttribute, input), cLabel, input, null, null, false);
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ":");
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeFaceName>(new DialogAttributeFaceName<G, A, R>(archetypeAttribute, input), label, input, null, null, false);
}
@Override
@@ -483,8 +483,8 @@
@Override
public void visit(@NotNull final ArchetypeAttributeFloat archetypeAttribute) {
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
- cLabel.setForeground(FLOAT_COLOR);
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ label.setForeground(FLOAT_COLOR);
final int fieldLength = archetypeAttribute.getInputLength() == 0 ? ArchetypeAttribute.TEXTFIELD_COLUMNS : archetypeAttribute.getInputLength();
final DecimalFormat format = new DecimalFormat("#0.0#");
format.setMaximumFractionDigits(10);
@@ -496,13 +496,13 @@
final Number value = gameObject.getAttributeDouble(archetypeAttribute.getArchetypeAttributeName());
final JFormattedTextField input = new JFormattedTextField(factory, value);
input.setColumns(fieldLength);
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeFloat>(new DialogAttributeFloat<G, A, R>(archetypeAttribute, input), cLabel, input, null, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeFloat>(new DialogAttributeFloat<G, A, R>(archetypeAttribute, input), label, input, null, null, false);
}
@Override
public void visit(@NotNull final ArchetypeAttributeInt archetypeAttribute) {
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
- cLabel.setForeground(INT_COLOR);
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ label.setForeground(INT_COLOR);
final int fieldLength = archetypeAttribute.getInputLength() == 0 ? ArchetypeAttribute.TEXTFIELD_COLUMNS : archetypeAttribute.getInputLength();
final NumberFormat format = NumberFormat.getIntegerInstance();
format.setGroupingUsed(false);
@@ -512,42 +512,42 @@
final Number value = gameObject.getAttributeInt(archetypeAttribute.getArchetypeAttributeName());
final JFormattedTextField input = new JFormattedTextField(factory, value);
input.setColumns(fieldLength);
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeInt>(new DialogAttributeInt<G, A, R>(archetypeAttribute, input), cLabel, input, null, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeInt>(new DialogAttributeInt<G, A, R>(archetypeAttribute, input), label, input, null, null, false);
}
@Override
public void visit(@NotNull final ArchetypeAttributeInvSpell archetypeAttribute) {
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
- cLabel.setForeground(INT_COLOR);
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ label.setForeground(INT_COLOR);
// create ComboBox with parsed selection
@Nullable final JComboBox input = buildInvSpellBox(gameObjectSpells, gameObject, archetypeAttribute.isOptionalSpell(), archetypeAttribute.getAttributeName());
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeInvSpell>(new DialogAttributeInvSpell<G, A, R>(archetypeAttribute.isOptionalSpell(), archetypeAttribute, input, gameObjectSpells), cLabel, input, null, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeInvSpell>(new DialogAttributeInvSpell<G, A, R>(archetypeAttribute.isOptionalSpell(), archetypeAttribute, input, gameObjectSpells), label, input, null, null, false);
}
@Override
public void visit(@NotNull final ArchetypeAttributeList archetypeAttribute) {
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
- cLabel.setForeground(INT_COLOR);
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ label.setForeground(INT_COLOR);
// create ComboBox with parsed selection
- final JComponent cComp;
+ final JComponent component;
@Nullable final JComboBox input;
final ArchetypeTypeList list = archetypeTypeSet.getList(archetypeAttribute.getListName());
if (list != null) {
// build the list from vector data
input = buildArrayBox(list, gameObject, archetypeAttribute.getArchetypeAttributeName(), archetypeAttribute.getAttributeName());
- cComp = input;
+ component = input;
} else {
// error: list data is missing or corrupt
input = new JComboBox();
- cComp = new JLabel("Error: Undefined List");
+ component = new JLabel("Error: Undefined List");
}
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeList>(new DialogAttributeList<G, A, R>(archetypeAttribute, input, archetypeTypeSet), cLabel, cComp, null, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeList>(new DialogAttributeList<G, A, R>(archetypeAttribute, input, archetypeTypeSet), label, component, null, null, false);
}
@Override
public void visit(@NotNull final ArchetypeAttributeLong archetypeAttribute) {
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
- cLabel.setForeground(INT_COLOR);
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ label.setForeground(INT_COLOR);
final int fieldLength = archetypeAttribute.getInputLength() == 0 ? ArchetypeAttribute.TEXTFIELD_COLUMNS : archetypeAttribute.getInputLength();
final NumberFormat format = NumberFormat.getIntegerInstance();
format.setGroupingUsed(false);
@@ -557,7 +557,7 @@
final Number value = gameObject.getAttributeLong(archetypeAttribute.getArchetypeAttributeName());
final JFormattedTextField input = new JFormattedTextField(factory, value);
input.setColumns(fieldLength);
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeLong>(new DialogAttributeLong<G, A, R>(archetypeAttribute, input), cLabel, input, null, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeLong>(new DialogAttributeLong<G, A, R>(archetypeAttribute, input), label, input, null, null, false);
}
@Override
@@ -567,34 +567,34 @@
if (relativeReference == null) {
relativeReference = new File(globalSettings.getMapsDirectory(), "dummy");
}
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
final TilePanel tilePanel = new TilePanel(mapFileFilter, gameObject.getAttributeString(archetypeAttribute.getArchetypeAttributeName()), relativeReference, globalSettings.getMapsDirectory());
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeMapPath>(new DialogAttributeMapPath<G, A, R>(archetypeAttribute, tilePanel), cLabel, tilePanel, null, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeMapPath>(new DialogAttributeMapPath<G, A, R>(archetypeAttribute, tilePanel), label, tilePanel, null, null, false);
}
@Override
public void visit(@NotNull final ArchetypeAttributeScriptFile archetypeAttribute) {
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
final File mapsDirectory = globalSettings.getMapsDirectory();
final TilePanel tilePanel = new TilePanel(scriptFileFilter, gameObject.getAttributeString(archetypeAttribute.getArchetypeAttributeName()), new File(mapsDirectory, "dummy"), mapsDirectory);
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeScriptFile>(new DialogAttributeScriptFile<G, A, R>(archetypeAttribute, tilePanel), cLabel, tilePanel, null, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeScriptFile>(new DialogAttributeScriptFile<G, A, R>(archetypeAttribute, tilePanel), label, tilePanel, null, null, false);
}
@Override
public void visit(@NotNull final ArchetypeAttributeSpell archetypeAttribute) {
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
- cLabel.setForeground(INT_COLOR);
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ label.setForeground(INT_COLOR);
// create ComboBox with parsed selection
@Nullable final JComboBox input = buildSpellBox(gameObject, numberSpells, undefinedSpellIndex, false, archetypeAttribute);
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeSpell>(new DialogAttributeSpell<G, A, R>(archetypeAttribute, input, numberSpells), cLabel, input, null, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeSpell>(new DialogAttributeSpell<G, A, R>(archetypeAttribute, input, numberSpells), label, input, null, null, false);
}
@Override
public void visit(@NotNull final ArchetypeAttributeString archetypeAttribute) {
final String defaultText = gameObject.getAttributeString(archetypeAttribute.getArchetypeAttributeName());
final JTextField input = new JTextField(defaultText, ArchetypeAttribute.TEXTFIELD_COLUMNS);
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeString>(new DialogAttributeString<G, A, R>(archetypeAttribute, input), cLabel, input, null, null, false);
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeString>(new DialogAttributeString<G, A, R>(archetypeAttribute, input), label, input, null, null, false);
}
@Override
@@ -629,17 +629,17 @@
final JTextField input = new JTextField(" " + treasureName, ArchetypeAttribute.TEXTFIELD_COLUMNS);
input.setEditable(false);
final DialogAttributeTreasure<G, A, R> tmpAttribute = new DialogAttributeTreasure<G, A, R>(archetypeAttribute, input, treasureTree);
- final JButton cLabel = new JButton(new ViewTreasurelistAL(input, GameObjectAttributesDialog.this, treasureListTree));
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeTreasure>(tmpAttribute, cLabel, input, null, null, false);
+ final JButton label = new JButton(new ViewTreasurelistAL(input, GameObjectAttributesDialog.this, treasureListTree));
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeTreasure>(tmpAttribute, label, input, null, null, false);
}
@Override
public void visit(@NotNull final ArchetypeAttributeZSpell archetypeAttribute) {
- final JLabel cLabel = new JLabel(archetypeAttribute.getAttributeName() + ": ");
- cLabel.setForeground(INT_COLOR);
+ final JLabel label = new JLabel(archetypeAttribute.getAttributeName() + ": ");
+ label.setForeground(INT_COLOR);
// create ComboBox with parsed selection
@Nullable final JComboBox input = buildSpellBox(gameObject, numberSpells, undefinedSpellIndex, true, archetypeAttribute);
- guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeZSpell>(new DialogAttributeZSpell<G, A, R>(archetypeAttribute, input, numberSpells, undefinedSpellIndex), cLabel, input, null, null, false);
+ guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeZSpell>(new DialogAttributeZSpell<G, A, R>(archetypeAttribute, input, numberSpells, undefinedSpellIndex), label, input, null, null, false);
}
};
@@ -1043,10 +1043,10 @@
dialogAttributes.add(tmpGuiInfo.getNewAttr());
helpButton.addActionListener(new HelpActionListener(tmpGuiInfo.getNewAttr().getRef(), this));
- addElement(panel, tmpGuiInfo.getCLabel(), labelGbc);
- addElement(panel, tmpGuiInfo.getCComp(), compGbc);
- addElement(panel, tmpGuiInfo.getCRow(), rowGbc);
- addElement(panel, tmpGuiInfo.getCGlue(), glueGbc);
+ addElement(panel, tmpGuiInfo.getLabel(), labelGbc);
+ addElement(panel, tmpGuiInfo.getComponent(), compGbc);
+ addElement(panel, tmpGuiInfo.getRow(), rowGbc);
+ addElement(panel, tmpGuiInfo.getGlue(), glueGbc);
isText |= tmpGuiInfo.isText();
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GuiInfo.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GuiInfo.java 2013-06-01 12:11:21 UTC (rev 9258)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GuiInfo.java 2013-06-01 13:10:50 UTC (rev 9259)
@@ -39,25 +39,25 @@
private final DialogAttribute<G, A, R, T> newAttr;
@Nullable
- private final Component cLabel;
+ private final Component label;
@Nullable
- private final Component cComp;
+ private final Component component;
@Nullable
- private final Component cRow;
+ private final Component row;
@Nullable
- private final Component cGlue;
+ private final Component glue;
private final boolean isText;
- public GuiInfo(@NotNull final DialogAttribute<G, A, R, T> newAttr, @Nullable final Component cLabel, @Nullable final Component cComp, @Nullable final Component cRow, @Nullable final Component cGlue, final boolean isText) {
+ public GuiInfo(@NotNull final DialogAttribute<G, A, R, T> newAttr, @Nullable final Component label, @Nullable final Component component, @Nullable final Component row, @Nullable final Component glue, final boolean isText) {
this.newAttr = newAttr;
- this.cLabel = cLabel;
- this.cComp = cComp;
- this.cRow = cRow;
- this.cGlue = cGlue;
+ this.label = label;
+ this.component = component;
+ this.row = row;
+ this.glue = glue;
this.isText = isText;
}
@@ -67,23 +67,23 @@
}
@Nullable
- public Component getCLabel() {
- return cLabel;
+ public Component getLabel() {
+ return label;
}
@Nullable
- public Component getCComp() {
- return cComp;
+ public Component getComponent() {
+ return component;
}
@Nullable
- public Component getCRow() {
- return cRow;
+ public Component getRow() {
+ return row;
}
@Nullable
- public Component getCGlue() {
- return cGlue;
+ public Component getGlue() {
+ return glue;
}
public boolean isText() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-06-01 12:11:25
|
Revision: 9258
http://sourceforge.net/p/gridarta/code/9258
Author: akirschbaum
Date: 2013-06-01 12:11:21 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Remove ArchetypeAttribute implements Cloneable as all instances are immutable.
Modified Paths:
--------------
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java 2013-06-01 10:51:43 UTC (rev 9257)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java 2013-06-01 12:11:21 UTC (rev 9258)
@@ -25,7 +25,7 @@
* This Class contains the data of one archetype attribute.
* @author <a href="mailto:and...@gm...">Andreas Vogl</a>
*/
-public abstract class ArchetypeAttribute implements Cloneable {
+public abstract class ArchetypeAttribute {
/**
* The width (columns) for input fields like textfields or JChooseBoxes.
@@ -70,19 +70,6 @@
}
/**
- * {@inheritDoc}
- */
- @NotNull
- @Override
- public ArchetypeAttribute clone() {
- try {
- return (ArchetypeAttribute) super.clone();
- } catch (final CloneNotSupportedException ex) {
- throw new AssertionError(ex);
- }
- }
-
- /**
* Returns the archetype attribute name.
* @return the archetype attribute name
*/
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java 2013-06-01 10:51:43 UTC (rev 9257)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java 2013-06-01 12:11:21 UTC (rev 9258)
@@ -184,7 +184,7 @@
if (log.isDebugEnabled()) {
log.debug("addDefaultList: adding " + archetypeAttributeName + " to section " + archetypeAttributeSection);
}
- newArchetypeType.addArchetypeAttribute(archetypeAttributeSection.getSectionName(), archetypeAttribute.clone());
+ newArchetypeType.addArchetypeAttribute(archetypeAttributeSection.getSectionName(), archetypeAttribute);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-06-01 10:51:50
|
Revision: 9257
http://sourceforge.net/p/gridarta/code/9257
Author: akirschbaum
Date: 2013-06-01 10:51:43 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Replace ArchetypeAttribute.sectionId with ArchetypeAttributeSection class.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeInvSpell.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeList.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeSpell.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeAnimationName.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBitmask.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBool.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBoolSpec.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFaceName.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFactory.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFixed.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFloat.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeInt.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeInvSpell.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeList.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeLong.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeMapPath.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeParser.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeScriptFile.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeSection.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeSpell.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeString.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeText.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeTreasure.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeZSpell.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeType.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/DefaultArchetypeAttributeFactory.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/checks/ArchetypeTypeChecks.java
trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetTest.java
trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeTest.java
trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/TestArchetypeAttribute.java
trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/TestArchetypeAttributeFactory.java
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt
Added Paths:
-----------
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeSections.java
Removed Paths:
-------------
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/SectionNames.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -88,6 +88,7 @@
import net.sf.gridarta.model.archetypetype.ArchetypeAttributeLong;
import net.sf.gridarta.model.archetypetype.ArchetypeAttributeMapPath;
import net.sf.gridarta.model.archetypetype.ArchetypeAttributeScriptFile;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeSection;
import net.sf.gridarta.model.archetypetype.ArchetypeAttributeSpell;
import net.sf.gridarta.model.archetypetype.ArchetypeAttributeString;
import net.sf.gridarta.model.archetypetype.ArchetypeAttributeText;
@@ -960,43 +961,49 @@
public final void buildAttribute() {
tabbedPane.removeAll();
final ArchetypeType archetypeType = typesBoxItemListener.getArchetypeType();
- for (int sectionId = 0; sectionId < archetypeType.getSectionNum(); sectionId++) {
- final Component panel = makeAttributePanel(sectionId);
+ int sectionId = 0;
+ for (final ArchetypeAttributeSection archetypeAttributeSection : archetypeType) {
+ final Component panel = makeAttributePanel(archetypeAttributeSection);
if (panel != null) {
- final String sectionName = archetypeType.getSectionName(sectionId);
- tabbedPane.addTab(sectionName, null, panel);
+ final String sectionName = archetypeAttributeSection.getSectionName();
+ final String title;
+ if (sectionName.length() <= 1) {
+ title = sectionName;
+ } else {
+ title = sectionName.substring(0, 1).toUpperCase() + sectionName.substring(1);
+ }
+ tabbedPane.addTab(title, null, panel);
+ sectionId++;
}
}
// set selected tab
- tabbedPane.setSelectedIndex(0);
+ tabbedPane.setSelectedIndex(sectionId > 0 ? 0 : -1);
tabbedPane.validate();
}
/**
* This method creates an attribute panel for one section of attributes. If
* the section is empty, null is returned.
- * @param sectionId the identifier of the section
+ * @param archetypeAttributeSection the section
* @return a <code>Component</code> containing the attribute panel
* (currently always a JScrollPane)
*/
@Nullable
- private Component makeAttributePanel(final int sectionId) {
+ private Component makeAttributePanel(@NotNull final Iterable<ArchetypeAttribute> archetypeAttributeSection) {
int matchingAttributes = 0; // number of attributes in this section
boolean hasBitmask = false; // true if this section contains a bitmask attribute
// first we check how many attributes this section has
- for (final ArchetypeAttribute archetypeAttribute : typesBoxItemListener.getArchetypeType()) {
- if (archetypeAttribute.getSectionId() == sectionId) {
- // count number of attributes
- if (!(archetypeAttribute instanceof ArchetypeAttributeFixed)) {
- matchingAttributes++;
- }
- // check for bitmask attributes
- if (!hasBitmask && archetypeAttribute instanceof ArchetypeAttributeBitmask) {
- hasBitmask = true;
- }
+ for (final ArchetypeAttribute archetypeAttribute : archetypeAttributeSection) {
+ // count number of attributes
+ if (!(archetypeAttribute instanceof ArchetypeAttributeFixed)) {
+ matchingAttributes++;
}
+ // check for bitmask attributes
+ if (!hasBitmask && archetypeAttribute instanceof ArchetypeAttributeBitmask) {
+ hasBitmask = true;
+ }
}
if (matchingAttributes == 0) {
return null;
@@ -1022,8 +1029,8 @@
boolean isText = false;
// now add the entries, line by line
- for (final ArchetypeAttribute archetypeAttribute : typesBoxItemListener.getArchetypeType()) {
- if (archetypeAttribute.getSectionId() == sectionId && !(archetypeAttribute instanceof ArchetypeAttributeFixed)) {
+ for (final ArchetypeAttribute archetypeAttribute : archetypeAttributeSection) {
+ if (!(archetypeAttribute instanceof ArchetypeAttributeFixed)) {
final AbstractButton helpButton = new JButton("?");
helpButton.setMargin(new Insets(0, 5, 0, 5));
panel.add(helpButton, helpGbc);
@@ -1190,17 +1197,19 @@
}
// Also write all the 'fixed' attributes into the archetype text
- for (final ArchetypeAttribute archetypeAttribute : typesBoxItemListener.getArchetypeType()) {
- // ### TODO: for changed types, copy fixed attributes over default arches ###
- if (archetypeAttribute instanceof ArchetypeAttributeFixed) {
- final String defaultValue = archetype.getAttributeString(archetypeAttribute.getArchetypeAttributeName());
- if (defaultValue.length() == 0 || (gameObject.getTypeNo() != archetype.getTypeNo() && !defaultValue.equalsIgnoreCase(archetypeAttribute.getAttributeName()))) {
- // usually, fixed attributes are only applied when *not* defined in the archetype.
- // the reason behind this is: if the default gameObject violates our fixed attribute,
- // we assume the default gameObject is "right" and we are "wrong". The typedefs aren't that trustworthy.
- // BUT - if the gameObject has a changed type, the archetype has lost it's credibility.
- // So, in this special case, the fixed attribute applies always.
- newArchText.append(archetypeAttribute.getArchetypeAttributeName()).append(" ").append(archetypeAttribute.getAttributeName()).append("\n");
+ for (final ArchetypeAttributeSection archetypeAttributeSection : typesBoxItemListener.getArchetypeType()) {
+ for (final ArchetypeAttribute archetypeAttribute : archetypeAttributeSection) {
+ // ### TODO: for changed types, copy fixed attributes over default arches ###
+ if (archetypeAttribute instanceof ArchetypeAttributeFixed) {
+ final String defaultValue = archetype.getAttributeString(archetypeAttribute.getArchetypeAttributeName());
+ if (defaultValue.length() == 0 || (gameObject.getTypeNo() != archetype.getTypeNo() && !defaultValue.equalsIgnoreCase(archetypeAttribute.getAttributeName()))) {
+ // usually, fixed attributes are only applied when *not* defined in the archetype.
+ // the reason behind this is: if the default gameObject violates our fixed attribute,
+ // we assume the default gameObject is "right" and we are "wrong". The typedefs aren't that trustworthy.
+ // BUT - if the gameObject has a changed type, the archetype has lost it's credibility.
+ // So, in this special case, the fixed attribute applies always.
+ newArchText.append(archetypeAttribute.getArchetypeAttributeName()).append(" ").append(archetypeAttribute.getAttributeName()).append("\n");
+ }
}
}
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeInvSpell.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeInvSpell.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeInvSpell.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,10 +34,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- protected AbstractArchetypeAttributeInvSpell(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ protected AbstractArchetypeAttributeInvSpell(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeList.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeList.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeList.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,10 +34,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- protected AbstractArchetypeAttributeList(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ protected AbstractArchetypeAttributeList(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeSpell.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeSpell.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AbstractArchetypeAttributeSpell.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -36,10 +36,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- protected AbstractArchetypeAttributeSpell(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ protected AbstractArchetypeAttributeSpell(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -56,30 +56,17 @@
private final int inputLength;
/**
- * Identifier of the section this attribute is in.
- */
- private int sectionId = -1;
-
- /**
- * Name of the section this attribute is in.
- */
- @NotNull
- private final String sectionName;
-
- /**
* Creates a new instance.
* @param archetypeAttributeName the archetype attribute name
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name
*/
- protected ArchetypeAttribute(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
+ protected ArchetypeAttribute(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
this.archetypeAttributeName = archetypeAttributeName;
this.attributeName = attributeName;
this.description = description;
this.inputLength = inputLength;
- this.sectionName = sectionName;
}
/**
@@ -96,31 +83,6 @@
}
/**
- * Returns the section ID.
- * @return the section ID
- */
- public int getSectionId() {
- return sectionId;
- }
-
- /**
- * Sets the section ID.
- * @param sectionId the section ID
- */
- public void setSectionId(final int sectionId) {
- this.sectionId = sectionId;
- }
-
- /**
- * Returns the section name.
- * @return the section name
- */
- @NotNull
- public String getSectionName() {
- return sectionName;
- }
-
- /**
* Returns the archetype attribute name.
* @return the archetype attribute name
*/
@@ -161,7 +123,7 @@
@NotNull
@Override
public String toString() {
- return "editor=" + archetypeAttributeName + ",arch=" + attributeName + ",section=" + sectionId + "/" + sectionName;
+ return "editor=" + archetypeAttributeName + ",arch=" + attributeName;
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeAnimationName.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeAnimationName.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeAnimationName.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,10 +34,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute faces
*/
- public ArchetypeAttributeAnimationName(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeAnimationName(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBitmask.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBitmask.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBitmask.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -40,11 +40,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @param bitmaskName the bitmask name
*/
- public ArchetypeAttributeBitmask(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName, @NotNull final String bitmaskName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeBitmask(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String bitmaskName) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
this.bitmaskName = bitmaskName;
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBool.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBool.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBool.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,10 +34,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- public ArchetypeAttributeBool(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeBool(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBoolSpec.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBoolSpec.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeBoolSpec.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -47,12 +47,11 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @param trueValue the true value
* @param falseValue the false value
*/
- public ArchetypeAttributeBoolSpec(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName, @NotNull final String trueValue, @NotNull final String falseValue) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeBoolSpec(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String trueValue, @NotNull final String falseValue) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
this.trueValue = trueValue;
this.falseValue = falseValue;
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFaceName.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFaceName.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFaceName.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,10 +34,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- public ArchetypeAttributeFaceName(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeFaceName(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFactory.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFactory.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFactory.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,11 +34,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the archetype attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeAnimname(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeAnimname(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "bitmask" archetype attribute.
@@ -46,12 +45,11 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @param bitmaskName the bitmask name
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeBitmask(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName, @NotNull String bitmaskName);
+ ArchetypeAttribute newArchetypeAttributeBitmask(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String bitmaskName);
/**
* Creates a new "bool" archetype attribute.
@@ -59,11 +57,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeBool(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeBool(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "bool spec" archetype attribute.
@@ -71,13 +68,12 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @param trueValue the true value
* @param falseValue the false value
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeBoolSpec(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName, @NotNull String trueValue, @NotNull String falseValue);
+ ArchetypeAttribute newArchetypeAttributeBoolSpec(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String trueValue, @NotNull String falseValue);
/**
* Creates a new "face name" archetype attribute.
@@ -85,11 +81,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeFacename(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeFacename(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "fixed" archetype attribute.
@@ -97,11 +92,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeFixed(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeFixed(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "float" archetype attribute.
@@ -109,11 +103,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeFloat(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeFloat(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "int" archetype attribute.
@@ -121,7 +114,6 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @param minValue the absolute minimum allowed value
* @param maxValue the absolute maximum allowed value
* @param minCheckValue the logical minimum allowed value
@@ -129,7 +121,7 @@
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeInt(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName, int minValue, int maxValue, int minCheckValue, int maxCheckValue);
+ ArchetypeAttribute newArchetypeAttributeInt(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, int minValue, int maxValue, int minCheckValue, int maxCheckValue);
/**
* Creates a new "inv spell" archetype attribute.
@@ -137,11 +129,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeInvSpell(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeInvSpell(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "inv spell optional" archetype attribute.
@@ -149,11 +140,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeInvSpellOptional(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeInvSpellOptional(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "list" archetype attribute.
@@ -161,12 +151,11 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @param listName the list name
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeList(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName, @NotNull String listName);
+ ArchetypeAttribute newArchetypeAttributeList(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String listName);
/**
* Creates a new "long" archetype attribute.
@@ -174,11 +163,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeLong(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeLong(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "map path" archetype attribute.
@@ -186,11 +174,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeMapPath(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeMapPath(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "script file" archetype attribute.
@@ -198,11 +185,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeScriptFile(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeScriptFile(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "spell" archetype attribute.
@@ -210,11 +196,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeSpell(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeSpell(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "string" archetype attribute.
@@ -222,11 +207,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeString(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeString(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "text" archetype attribute.
@@ -247,11 +231,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeTreasure(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeTreasure(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
/**
* Creates a new "z-spell" archetype attribute.
@@ -259,10 +242,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @return the bitmask attribute
*/
@NotNull
- ArchetypeAttribute newArchetypeAttributeZSpell(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength, @NotNull String sectionName);
+ ArchetypeAttribute newArchetypeAttributeZSpell(@NotNull String archetypeAttributeName, @NotNull String attributeName, @NotNull String description, int inputLength);
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFixed.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFixed.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFixed.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,10 +34,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- public ArchetypeAttributeFixed(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeFixed(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFloat.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFloat.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeFloat.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,10 +34,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- public ArchetypeAttributeFloat(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeFloat(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeInt.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeInt.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeInt.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -54,14 +54,13 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @param minValue the absolute minimum allowed value
* @param maxValue the absolute maximum allowed value
* @param minCheckValue the logical minimum allowed value
* @param maxCheckValue the logical maximum allowed value
*/
- public ArchetypeAttributeInt(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName, final int minValue, final int maxValue, final int minCheckValue, final int maxCheckValue) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeInt(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, final int minValue, final int maxValue, final int minCheckValue, final int maxCheckValue) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
this.minValue = minValue;
this.maxValue = maxValue;
this.minCheckValue = minCheckValue;
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeInvSpell.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeInvSpell.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeInvSpell.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -41,10 +41,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- public ArchetypeAttributeInvSpell(final boolean isOptionalSpell, @NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeInvSpell(final boolean isOptionalSpell, @NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
this.isOptionalSpell = isOptionalSpell;
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeList.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeList.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeList.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -40,11 +40,10 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
* @param listName the list name
*/
- public ArchetypeAttributeList(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName, @NotNull final String listName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeList(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String listName) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
this.listName = listName;
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeLong.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeLong.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeLong.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,10 +34,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- public ArchetypeAttributeLong(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeLong(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeMapPath.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeMapPath.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeMapPath.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -34,10 +34,9 @@
* @param attributeName the user interface attribute name
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
- * @param sectionName the section name for the new attribute
*/
- public ArchetypeAttributeMapPath(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
+ public ArchetypeAttributeMapPath(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength) {
+ super(archetypeAttributeName, attributeName, description, inputLength);
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeParser.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeParser.java 2013-05-31 18:18:34 UTC (rev 9256)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttributeParser.java 2013-06-01 10:51:43 UTC (rev 9257)
@@ -62,20 +62,19 @@
* @param archetypeTypeSet the archetype type list
* @param typeName (descriptive) name of the type this attribute belongs to
* (e.g. "Weapon")
- * @param sectionName the section name for the new attribute
* @return the archetype attribute or <code>null</code> if an error occurs
* @throws MissingAttributeException if the element cannot be parsed
*/
@Nullable
@SuppressWarnings("FeatureEnvy")
- public ArchetypeAttribute load(@NotNull final Element attributeElement, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final String typeName, @NotNull final String sectionName) throws MissingAttributeException {
+ public ArchetypeAttribute load(@NotNull final Element attributeElement, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final String typeName) throws MissingAttributeException {
final String description = parseText(attributeElement);
final int inputLength = getAttributeIntValue(attributeElement, Constants.XML_ATTRIBUTE_LENGTH, 0, typeName, errorViewCollector);
final String attributeType = getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_TYPE);
if (attributeType.equals("bool")) {
- return archetypeAttributeFactory.newArchetypeAttributeBool(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName);
+ return archetypeAttributeFactory.newArchetypeAttributeBool(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength);
} else if (attributeType.equals("bool_special")) {
- return archetypeAttributeFactory.newArchetypeAttributeBoolSpec(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName, getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_TRUE), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_FALSE));
+ return archetypeAttributeFactory.newArchetypeAttributeBoolSpec(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_TRUE), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_FALSE));
} else if (attributeType.equals("int")) {
final int minValue = getAttributeIntValue(attributeElement, Constants.XML_ATTRIBUTE_MIN, Integer.MIN_VALUE, typeName, errorViewCollector);
final int maxValue = getAttributeIntValue(attributeElement, Constants.XML_ATTRIBUTE_MAX, Integer.MAX_VALUE, typeName, errorViewCollector);
@@ -102,33 +101,33 @@
return null;
}
- return archetypeAttributeFactory.newArchetypeAttributeInt(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName, minValue, maxValue, minCheckValue, maxCheckValue);
+ return archetypeAttributeFactory.newArchetypeAttributeInt(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, minValue, maxValue, minCheckValue, maxCheckValue);
} else if (attributeType.equals("long")) {
- return archetypeAttributeFactory.newArchetypeAttributeLong(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName);
+ return archetypeAttributeFactory.newArchetypeAttributeLong(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength);
} else if (attributeType.equals("float")) {
- return archetypeAttributeFactory.newArchetypeAttributeFloat(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName);
+ return archetypeAttributeFactory.newArchetypeAttributeFloat(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength);
} else if (attributeType.equals("string")) {
- return archetypeAttributeFactory.newArchetypeAttributeString(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName);
+ return archetypeAttributeFactory.newArchetypeAttributeString(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength);
} else if (attributeType.equals("map_path")) {
- return archetypeAttributeFactory.newArchetypeAttributeMapPath(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName);
+ return archetypeAttributeFactory.newArchetypeAttributeMapPath(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength);
} else if (attributeType.equals("script_file")) {
- return archetypeAttributeFactory.newArchetypeAttributeScriptFile(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName);
+ return archetypeAttributeFactory.newArchetypeAttributeScriptFile(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength);
} else if (attributeType.equals("facename")) {
- return archetypeAttributeFactory.newArchetypeAttributeFacename(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName);
+ return archetypeAttributeFactory.newArchetypeAttributeFacename(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength);
} else if (attributeType.equals("animname")) {
- return archetypeAttributeFactory.newArchetypeAttributeAnimname(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, sectionName);
+ return archetypeAttributeFactory.newArchetypeAttributeAnimname(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength);
} else if (attributeType.equals("text")) {
return archetypeAttributeFactory.newArchetypeAttributeText(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH_BEGIN), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH_END), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_EDITOR), description, inputLength, getAttributeValueOptional(attributeElement, Constants.XML_ATTRIBUTE_MARKER));
} else if (attributeType.equals("fixed")) {
- return archetypeAttributeFactory.newArchetypeAttributeFixed(getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_ARCH), getAttributeValue(attributeElement, Constants.XML_ATTRIBUTE_VALUE), description, inputLength, sectionName);
+ return archetypeAttributeFactory.newAr...
[truncated message content] |
|
From: <aki...@us...> - 2013-05-31 18:18:40
|
Revision: 9256
http://sourceforge.net/p/gridarta/code/9256
Author: akirschbaum
Date: 2013-05-31 18:18:34 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Rename parameter name.
Modified Paths:
--------------
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java 2013-05-31 18:12:42 UTC (rev 9255)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java 2013-05-31 18:18:34 UTC (rev 9256)
@@ -66,14 +66,14 @@
* Constants#XML_ELEMENT_ATTRIBUTE} elements from a types.xml file.
* @param typeElement the xml 'type' element which is going to be parsed
* @param errorViewCollector the error view collector for reporting errors
- * @param archetypeType the parent archetype type
+ * @param parentArchetypeType the parent archetype type
* @param archetypeTypeSet archetype type list
* @param ignorelistsDefinition the ignore_lists contents
* @param isDefaultType whether this element is the "default_type"
* @return the archetype type or <code>null</code>
*/
@NotNull
- public ArchetypeType loadAttributeList(@NotNull final Element typeElement, @NotNull final ErrorViewCollector errorViewCollector, @Nullable final ArchetypeType archetypeType, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final IgnorelistsDefinition ignorelistsDefinition, final boolean isDefaultType) {
+ public ArchetypeType loadAttributeList(@NotNull final Element typeElement, @NotNull final ErrorViewCollector errorViewCollector, @Nullable final ArchetypeType parentArchetypeType, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final IgnorelistsDefinition ignorelistsDefinition, final boolean isDefaultType) {
final String typeName = parseTypeName(typeElement, isDefaultType);
final int typeNo = parseTypeNo(typeElement, isDefaultType, typeName, errorViewCollector);
final String display = typeElement.getAttribute(Constants.XML_TYPE_DISPLAY);
@@ -96,19 +96,19 @@
final ArchetypeAttributeSection attributeSection = new ArchetypeAttributeSection();
final SectionNames sectionNames = new SectionNames();
addAttributeList(typeElement, attributeSection, errorViewCollector, typeName, typeNo == -1 ? SectionNames.GENERAL_SECTION : SectionNames.SPECIAL_SECTION, sectionNames, archetypeTypeSet);
- if (archetypeType != null) {
+ if (parentArchetypeType != null) {
final Collection<String> autoIgnoreTable = new HashSet<String>();
for (final ArchetypeAttribute attribute : attributeSection) {
autoIgnoreTable.add(attribute.getArchetypeAttributeName());
}
- if (archetypeType.hasAttribute()) {
+ if (parentArchetypeType.hasAttribute()) {
for (final String importType : importTypes) {
addImportList(importType, attributeSection, errorViewCollector, typeName, archetypeTypeSet, autoIgnoreTable);
}
}
- addDefaultList(archetypeType, attributeSection, autoIgnoreTable, ignoreTable);
+ addDefaultList(parentArchetypeType, attributeSection, autoIgnoreTable, ignoreTable);
}
attributeSection.setSectionNames(sectionNames);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-31 18:12:47
|
Revision: 9255
http://sourceforge.net/p/gridarta/code/9255
Author: akirschbaum
Date: 2013-05-31 18:12:42 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Properly initialize log4j in regression tests.
Added Paths:
-----------
trunk/src/atrinik/src/test/resources/log4j.properties
trunk/src/crossfire/src/test/resources/log4j.properties
trunk/src/daimonin/src/test/resources/log4j.properties
trunk/src/gridarta/src/test/resources/log4j.properties
trunk/src/model/src/test/resources/log4j.properties
trunk/src/plugin/src/test/resources/log4j.properties
trunk/src/preferences/src/test/resources/log4j.properties
trunk/src/textedit/src/test/resources/log4j.properties
trunk/src/utils/src/test/resources/log4j.properties
Added: trunk/src/atrinik/src/test/resources/log4j.properties
===================================================================
--- trunk/src/atrinik/src/test/resources/log4j.properties (rev 0)
+++ trunk/src/atrinik/src/test/resources/log4j.properties 2013-05-31 18:12:42 UTC (rev 9255)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/atrinik/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/crossfire/src/test/resources/log4j.properties
===================================================================
--- trunk/src/crossfire/src/test/resources/log4j.properties (rev 0)
+++ trunk/src/crossfire/src/test/resources/log4j.properties 2013-05-31 18:12:42 UTC (rev 9255)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/crossfire/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/daimonin/src/test/resources/log4j.properties
===================================================================
--- trunk/src/daimonin/src/test/resources/log4j.properties (rev 0)
+++ trunk/src/daimonin/src/test/resources/log4j.properties 2013-05-31 18:12:42 UTC (rev 9255)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/daimonin/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/gridarta/src/test/resources/log4j.properties
===================================================================
--- trunk/src/gridarta/src/test/resources/log4j.properties (rev 0)
+++ trunk/src/gridarta/src/test/resources/log4j.properties 2013-05-31 18:12:42 UTC (rev 9255)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/gridarta/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/log4j.properties
===================================================================
--- trunk/src/model/src/test/resources/log4j.properties (rev 0)
+++ trunk/src/model/src/test/resources/log4j.properties 2013-05-31 18:12:42 UTC (rev 9255)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/model/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/plugin/src/test/resources/log4j.properties
===================================================================
--- trunk/src/plugin/src/test/resources/log4j.properties (rev 0)
+++ trunk/src/plugin/src/test/resources/log4j.properties 2013-05-31 18:12:42 UTC (rev 9255)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/plugin/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/preferences/src/test/resources/log4j.properties
===================================================================
--- trunk/src/preferences/src/test/resources/log4j.properties (rev 0)
+++ trunk/src/preferences/src/test/resources/log4j.properties 2013-05-31 18:12:42 UTC (rev 9255)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/preferences/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/textedit/src/test/resources/log4j.properties
===================================================================
--- trunk/src/textedit/src/test/resources/log4j.properties (rev 0)
+++ trunk/src/textedit/src/test/resources/log4j.properties 2013-05-31 18:12:42 UTC (rev 9255)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/textedit/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/utils/src/test/resources/log4j.properties
===================================================================
--- trunk/src/utils/src/test/resources/log4j.properties (rev 0)
+++ trunk/src/utils/src/test/resources/log4j.properties 2013-05-31 18:12:42 UTC (rev 9255)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/utils/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-31 14:36:10
|
Revision: 9254
http://sourceforge.net/p/gridarta/code/9254
Author: akirschbaum
Date: 2013-05-31 14:36:04 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Fix checkstyle issues.
Modified Paths:
--------------
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java 2013-05-31 14:28:24 UTC (rev 9253)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java 2013-05-31 14:36:04 UTC (rev 9254)
@@ -161,7 +161,7 @@
@NotNull
@Override
public String toString() {
- return "editor="+archetypeAttributeName + ",arch=" + attributeName + ",section=" + sectionId + "/" + sectionName;
+ return "editor=" + archetypeAttributeName + ",arch=" + attributeName + ",section=" + sectionId + "/" + sectionName;
}
/**
Modified: trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
===================================================================
--- trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2013-05-31 14:28:24 UTC (rev 9253)
+++ trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2013-05-31 14:36:04 UTC (rev 9254)
@@ -23,7 +23,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
import javax.xml.parsers.ParserConfigurationException;
import net.sf.gridarta.model.errorview.ErrorView;
import net.sf.gridarta.model.errorview.ErrorViewCollector;
@@ -146,7 +145,7 @@
* Checks that a types.xml file can be read.
* @param name the base name of the resources to load
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
private void check(@NotNull final String name) throws ParserConfigurationException, IOException {
final ArchetypeTypeSet archetypeTypeSet = new ArchetypeTypeSet();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-31 14:28:29
|
Revision: 9253
http://sourceforge.net/p/gridarta/code/9253
Author: akirschbaum
Date: 2013-05-31 14:28:24 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Change format of expected test results of ArchetypeTypeSetParserTest.
Modified Paths:
--------------
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeType.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java 2013-05-31 14:28:24 UTC (rev 9253)
@@ -161,7 +161,7 @@
@NotNull
@Override
public String toString() {
- return archetypeAttributeName + "[" + attributeName + "] section=" + sectionId + "/" + sectionName;
+ return "editor="+archetypeAttributeName + ",arch=" + attributeName + ",section=" + sectionId + "/" + sectionName;
}
/**
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeType.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeType.java 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeType.java 2013-05-31 14:28:24 UTC (rev 9253)
@@ -278,16 +278,18 @@
* @param sb the string builder
*/
public void toString(@NotNull final StringBuilder sb) {
+ sb.append("type=");
sb.append(typeNo);
- sb.append(',');
+ sb.append(",name=");
sb.append(typeName);
- sb.append("\n:\n");
+ sb.append("\n");
for (final ArchetypeAttributeDefinition typeAttribute : typeAttributes) {
+ sb.append(" type:");
sb.append(typeAttribute);
- sb.append('\n');
+ sb.append("\n");
}
- sb.append(":\n");
for (final ArchetypeAttribute archetypeAttribute : archetypeAttributeSection) {
+ sb.append(" attr:");
sb.append(archetypeAttribute);
sb.append('\n');
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java 2013-05-31 14:28:24 UTC (rev 9253)
@@ -227,23 +227,9 @@
final StringBuilder sb = new StringBuilder();
final Map<String, ArchetypeType> sortedArchetypeTypes = new TreeMap<String, ArchetypeType>(archetypeTypeNames);
for (final ArchetypeType archetypeType : sortedArchetypeTypes.values()) {
- format(sb, archetypeType, "type");
+ archetypeType.toString(sb);
}
return sb.toString();
}
- /**
- * Appends the string representation of an {@link ArchetypeType} instance to
- * a {@link StringBuilder}.
- * @param sb the string builder
- * @param archetypeType the archetype type
- * @param title the title to prepend the entry
- */
- private static void format(@NotNull final StringBuilder sb, @NotNull final ArchetypeType archetypeType, @NotNull final String title) {
- sb.append(title);
- sb.append(':');
- archetypeType.toString(sb);
- sb.append('\n');
- }
-
}
Modified: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt 2013-05-31 14:28:24 UTC (rev 9253)
@@ -1,6 +1,3 @@
errors=false
-type:1,name1
-:
-:
-string/default_attr2[default] section=0/General
-
+type=1,name=name1
+ attr:string/editor=default_attr2,arch=default,section=0/General
Modified: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt 2013-05-31 14:28:24 UTC (rev 9253)
@@ -1,7 +1,4 @@
errors=false
-type:1,name1
-:
-:
-string/name1_attr1[name1] section=1/Special
-string/name1_attr2[name1] section=1/Special
-
+type=1,name=name1
+ attr:string/editor=name1_attr1,arch=name1,section=1/Special
+ attr:string/editor=name1_attr2,arch=name1,section=1/Special
Modified: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt 2013-05-31 14:28:24 UTC (rev 9253)
@@ -1,15 +1,9 @@
errors=false
-type:1,name1
-:
-:
-string/name1_attr1[name1] section=1/Special
-string/name1_attr2[name1] section=1/Special
-string/default_attr1[default] section=0/General
-
-type:2,name2
-:
-:
-string/name1_attr1[name1] section=1/Special
-string/name1_attr2[name1] section=1/Special
-string/default_attr1[default] section=0/General
-
+type=1,name=name1
+ attr:string/editor=name1_attr1,arch=name1,section=1/Special
+ attr:string/editor=name1_attr2,arch=name1,section=1/Special
+ attr:string/editor=default_attr1,arch=default,section=0/General
+type=2,name=name2
+ attr:string/editor=name1_attr1,arch=name1,section=1/Special
+ attr:string/editor=name1_attr2,arch=name1,section=1/Special
+ attr:string/editor=default_attr1,arch=default,section=0/General
Modified: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt 2013-05-31 14:28:24 UTC (rev 9253)
@@ -1,18 +1,12 @@
errors=false
-type:1,name1
-:
-:
-string/name1_attr1[name1] section=1/Special
-string/name1_attr2[name1] section=1/Special
-string/default_attr1[default] section=0/General
-string/default_attr2[default] section=0/General
-
-type:2,name2
-:
-:
-string/name2_attr1[name2] section=1/Special
-string/name1_attr2[name2] section=1/Special
-string/default_attr2[name2] section=1/Special
-string/name1_attr1[name1] section=1/Special
-string/default_attr1[default] section=0/General
-
+type=1,name=name1
+ attr:string/editor=name1_attr1,arch=name1,section=1/Special
+ attr:string/editor=name1_attr2,arch=name1,section=1/Special
+ attr:string/editor=default_attr1,arch=default,section=0/General
+ attr:string/editor=default_attr2,arch=default,section=0/General
+type=2,name=name2
+ attr:string/editor=name2_attr1,arch=name2,section=1/Special
+ attr:string/editor=name1_attr2,arch=name2,section=1/Special
+ attr:string/editor=default_attr2,arch=name2,section=1/Special
+ attr:string/editor=name1_attr1,arch=name1,section=1/Special
+ attr:string/editor=default_attr1,arch=default,section=0/General
Modified: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt 2013-05-31 14:28:24 UTC (rev 9253)
@@ -1,52 +1,43 @@
errors=false
-type:1,name1
-:
-:
-string/attr2[name1] section=1/Special
-string/attr3[name1] section=1/Special
-string/attr6[name1] section=1/Special
-string/attr7[name1] section=1/Special
-string/attrA[name1] section=1/Special
-string/attrB[name1] section=1/Special
-string/attrE[name1] section=1/Special
-string/attrF[name1] section=1/Special
-string/attr1[default] section=0/General
-string/attr5[default] section=0/General
-string/attr9[default] section=0/General
-string/attrD[default] section=0/General
-
-type:2,name2
-:
-:
-string/attr4[name2] section=1/Special
-string/attr5[name2] section=1/Special
-string/attr6[name2] section=1/Special
-string/attr7[name2] section=1/Special
-string/attrC[name2] section=1/Special
-string/attrD[name2] section=1/Special
-string/attrE[name2] section=1/Special
-string/attrF[name2] section=1/Special
-string/attr1[default] section=0/General
-string/attr3[default] section=0/General
-string/attr9[default] section=0/General
-string/attrB[default] section=0/General
-
-type:3,name3
-:
-:
-string/attr8[name3] section=1/Special
-string/attr9[name3] section=1/Special
-string/attrA[name3] section=1/Special
-string/attrB[name3] section=1/Special
-string/attrC[name3] section=1/Special
-string/attrD[name3] section=1/Special
-string/attrE[name3] section=1/Special
-string/attrF[name3] section=1/Special
-string/attr2[name1] section=1/Special
-string/attr3[name1] section=1/Special
-string/attr6[name1] section=1/Special
-string/attr7[name1] section=1/Special
-string/attr4[name2] section=1/Special
-string/attr5[name2] section=1/Special
-string/attr1[default] section=0/General
-
+type=1,name=name1
+ attr:string/editor=attr2,arch=name1,section=1/Special
+ attr:string/editor=attr3,arch=name1,section=1/Special
+ attr:string/editor=attr6,arch=name1,section=1/Special
+ attr:string/editor=attr7,arch=name1,section=1/Special
+ attr:string/editor=attrA,arch=name1,section=1/Special
+ attr:string/editor=attrB,arch=name1,section=1/Special
+ attr:string/editor=attrE,arch=name1,section=1/Special
+ attr:string/editor=attrF,arch=name1,section=1/Special
+ attr:string/editor=attr1,arch=default,section=0/General
+ attr:string/editor=attr5,arch=default,section=0/General
+ attr:string/editor=attr9,arch=default,section=0/General
+ attr:string/editor=attrD,arch=default,section=0/General
+type=2,name=name2
+ attr:string/editor=attr4,arch=name2,section=1/Special
+ attr:string/editor=attr5,arch=name2,section=1/Special
+ attr:string/editor=attr6,arch=name2,section=1/Special
+ attr:string/editor=attr7,arch=name2,section=1/Special
+ attr:string/editor=attrC,arch=name2,section=1/Special
+ attr:string/editor=attrD,arch=name2,section=1/Special
+ attr:string/editor=attrE,arch=name2,section=1/Special
+ attr:string/editor=attrF,arch=name2,section=1/Special
+ attr:string/editor=attr1,arch=default,section=0/General
+ attr:string/editor=attr3,arch=default,section=0/General
+ attr:string/editor=attr9,arch=default,section=0/General
+ attr:string/editor=attrB,arch=default,section=0/General
+type=3,name=name3
+ attr:string/editor=attr8,arch=name3,section=1/Special
+ attr:string/editor=attr9,arch=name3,section=1/Special
+ attr:string/editor=attrA,arch=name3,section=1/Special
+ attr:string/editor=attrB,arch=name3,section=1/Special
+ attr:string/editor=attrC,arch=name3,section=1/Special
+ attr:string/editor=attrD,arch=name3,section=1/Special
+ attr:string/editor=attrE,arch=name3,section=1/Special
+ attr:string/editor=attrF,arch=name3,section=1/Special
+ attr:string/editor=attr2,arch=name1,section=1/Special
+ attr:string/editor=attr3,arch=name1,section=1/Special
+ attr:string/editor=attr6,arch=name1,section=1/Special
+ attr:string/editor=attr7,arch=name1,section=1/Special
+ attr:string/editor=attr4,arch=name2,section=1/Special
+ attr:string/editor=attr5,arch=name2,section=1/Special
+ attr:string/editor=attr1,arch=default,section=0/General
Modified: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt 2013-05-31 14:28:24 UTC (rev 9253)
@@ -1,6 +1,3 @@
errors=false
-type:1,name1
-:
-:
-text/msg[default] section=2/default
-
+type=1,name=name1
+ attr:text/editor=msg,arch=default,section=2/default
Modified: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt 2013-05-31 14:28:24 UTC (rev 9253)
@@ -1,6 +1,3 @@
errors=false
-type:1,name1
-:
-:
-text/msg[name1] section=2/name1
-
+type=1,name=name1
+ attr:text/editor=msg,arch=name1,section=2/name1
Modified: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt 2013-05-31 14:28:24 UTC (rev 9253)
@@ -1,5 +1,2 @@
errors=false
-type:1,name1
-:
-:
-
+type=1,name=name1
Modified: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt 2013-05-31 14:28:24 UTC (rev 9253)
@@ -1,7 +1,4 @@
errors=false
-type:123,name 123
-:
-:
-fixed/f[v] section=1/Special
-string/name[name_editor] section=0/General
-
+type=123,name=name 123
+ attr:fixed/editor=f,arch=v,section=1/Special
+ attr:string/editor=name,arch=name_editor,section=0/General
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-31 14:06:14
|
Revision: 9252
http://sourceforge.net/p/gridarta/code/9252
Author: akirschbaum
Date: 2013-05-31 14:06:09 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Extract ArchetypeTypeSetParserTest tests into resources.
Modified Paths:
--------------
trunk/gridarta.ipr
trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
Added Paths:
-----------
trunk/src/model/src/test/resources/net/
trunk/src/model/src/test/resources/net/sf/
trunk/src/model/src/test/resources/net/sf/gridarta/
trunk/src/model/src/test/resources/net/sf/gridarta/model/
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-types.xml
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-types.xml
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-types.xml
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-types.xml
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-types.xml
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-types.xml
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-types.xml
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-types.xml
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt
trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-types.xml
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-05-31 13:46:02 UTC (rev 9251)
+++ trunk/gridarta.ipr 2013-05-31 14:06:09 UTC (rev 9252)
@@ -228,6 +228,7 @@
<entry name="?*.png" />
<entry name="?*.jpeg" />
<entry name="?*.jpg" />
+ <entry name="?*.txt" />
</wildcardResourcePatterns>
<annotationProcessing enabled="false" useClasspath="true" />
</component>
Modified: trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
===================================================================
--- trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2013-05-31 13:46:02 UTC (rev 9251)
+++ trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2013-05-31 14:06:09 UTC (rev 9252)
@@ -19,8 +19,10 @@
package net.sf.gridarta.model.archetypetype;
-import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import javax.xml.parsers.ParserConfigurationException;
import net.sf.gridarta.model.errorview.ErrorView;
@@ -53,419 +55,123 @@
/**
* Read a simple types.xml file.
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
@Test
- public void test1() throws ParserConfigurationException, UnsupportedEncodingException {
- final StringBuilder typesXml = new StringBuilder();
- typesXml.append("<bitmasks/>\n");
- typesXml.append("<lists/>\n");
- typesXml.append("<ignorelists/>\n");
- typesXml.append("<default_type>\n");
- typesXml.append("<attribute arch=\"name\" editor=\"name_editor\" type=\"string\">name description</attribute>\n");
- typesXml.append("</default_type>\n");
- typesXml.append("<type number=\"123\" name=\"name 123\">\n");
- typesXml.append("<description>description 123</description>\n");
- typesXml.append("<attribute arch=\"f\" value=\"v\" type=\"fixed\"/>\n");
- typesXml.append("</type>\n");
- final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("type:123,name 123\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("fixed/f[v] section=1/Special\n");
- expectedResult.append("string/name[name_editor] section=0/General\n");
- expectedResult.append("\n");
- check(typesXml.toString(), false, expectedResult.toString());
+ public void test1() throws ParserConfigurationException, IOException {
+ check("test1");
}
/**
* Checks that imports do work.
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
@Test
- public void testImport1() throws ParserConfigurationException, UnsupportedEncodingException {
- final StringBuilder typesXml = new StringBuilder();
- typesXml.append("<bitmasks/>\n");
- typesXml.append("<lists/>\n");
- typesXml.append("<ignorelists/>\n");
- typesXml.append("<default_type>\n");
- typesXml.append("<attribute arch=\"default_attr1\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"default_attr2\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("</default_type>\n");
- typesXml.append("<type number=\"1\" name=\"name1\">\n");
- typesXml.append("<description>description1</description>\n");
- typesXml.append("<attribute arch=\"name1_attr1\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"name1_attr2\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("</type>\n");
- typesXml.append("<type number=\"2\" name=\"name2\">\n");
- typesXml.append("<import_type name=\"name1\"/>\n");
- typesXml.append("<description>description2</description>\n");
- typesXml.append("<attribute arch=\"name2_attr1\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"name1_attr2\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"default_attr2\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("</type>\n");
- final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("type:1,name1\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("string/name1_attr1[name1] section=1/Special\n");
- expectedResult.append("string/name1_attr2[name1] section=1/Special\n");
- expectedResult.append("string/default_attr1[default] section=0/General\n");
- expectedResult.append("string/default_attr2[default] section=0/General\n");
- expectedResult.append("\n");
- expectedResult.append("type:2,name2\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- expectedResult.append("string/name2_attr1[name2] section=1/Special\n");
- expectedResult.append("string/name1_attr2[name2] section=1/Special\n");
- expectedResult.append("string/default_attr2[name2] section=1/Special\n");
- /* imports */
- expectedResult.append("string/name1_attr1[name1] section=1/Special\n");
- /* defaults */
- expectedResult.append("string/default_attr1[default] section=0/General\n");
- expectedResult.append("\n");
- check(typesXml.toString(), false, expectedResult.toString());
+ public void testImport1() throws ParserConfigurationException, IOException {
+ check("import1");
}
/**
* Checks that multi-imports do work.
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
@Test
- public void testImport2() throws ParserConfigurationException, UnsupportedEncodingException {
- final StringBuilder typesXml = new StringBuilder();
- typesXml.append("<bitmasks/>\n");
- typesXml.append("<lists/>\n");
- typesXml.append("<ignorelists/>\n");
- typesXml.append("<default_type>\n");
- typesXml.append("<attribute arch=\"attr1\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr3\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr5\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr7\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr9\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrB\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrD\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrF\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("</default_type>\n");
- typesXml.append("<type number=\"1\" name=\"name1\">\n");
- typesXml.append("<description>description1</description>\n");
- typesXml.append("<attribute arch=\"attr2\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr3\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr6\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr7\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrA\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrB\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrE\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrF\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("</type>\n");
- typesXml.append("<type number=\"2\" name=\"name2\">\n");
- typesXml.append("<description>description2</description>\n");
- typesXml.append("<attribute arch=\"attr4\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr5\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr6\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr7\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrC\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrD\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrE\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrF\" editor=\"name2\" type=\"string\">description</attribute>\n");
- typesXml.append("</type>\n");
- typesXml.append("<type number=\"3\" name=\"name3\">\n");
- typesXml.append("<import_type name=\"name1\"/>\n");
- typesXml.append("<import_type name=\"name2\"/>\n");
- typesXml.append("<description>description3</description>\n");
- typesXml.append("<attribute arch=\"attr8\" editor=\"name3\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attr9\" editor=\"name3\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrA\" editor=\"name3\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrB\" editor=\"name3\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrC\" editor=\"name3\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrD\" editor=\"name3\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrE\" editor=\"name3\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"attrF\" editor=\"name3\" type=\"string\">description</attribute>\n");
- typesXml.append("</type>\n");
- final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("type:1,name1\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- expectedResult.append("string/attr2[name1] section=1/Special\n");
- expectedResult.append("string/attr3[name1] section=1/Special\n");
- expectedResult.append("string/attr6[name1] section=1/Special\n");
- expectedResult.append("string/attr7[name1] section=1/Special\n");
- expectedResult.append("string/attrA[name1] section=1/Special\n");
- expectedResult.append("string/attrB[name1] section=1/Special\n");
- expectedResult.append("string/attrE[name1] section=1/Special\n");
- expectedResult.append("string/attrF[name1] section=1/Special\n");
- /* defaults */
- expectedResult.append("string/attr1[default] section=0/General\n");
- expectedResult.append("string/attr5[default] section=0/General\n");
- expectedResult.append("string/attr9[default] section=0/General\n");
- expectedResult.append("string/attrD[default] section=0/General\n");
- /* imports */
- expectedResult.append("\n");
- expectedResult.append("type:2,name2\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- expectedResult.append("string/attr4[name2] section=1/Special\n");
- expectedResult.append("string/attr5[name2] section=1/Special\n");
- expectedResult.append("string/attr6[name2] section=1/Special\n");
- expectedResult.append("string/attr7[name2] section=1/Special\n");
- expectedResult.append("string/attrC[name2] section=1/Special\n");
- expectedResult.append("string/attrD[name2] section=1/Special\n");
- expectedResult.append("string/attrE[name2] section=1/Special\n");
- expectedResult.append("string/attrF[name2] section=1/Special\n");
- /* defaults */
- expectedResult.append("string/attr1[default] section=0/General\n");
- expectedResult.append("string/attr3[default] section=0/General\n");
- expectedResult.append("string/attr9[default] section=0/General\n");
- expectedResult.append("string/attrB[default] section=0/General\n");
- /* attributes */
- /* imports */
- expectedResult.append("\n");
- expectedResult.append("type:3,name3\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("string/attr8[name3] section=1/Special\n");
- expectedResult.append("string/attr9[name3] section=1/Special\n");
- expectedResult.append("string/attrA[name3] section=1/Special\n");
- expectedResult.append("string/attrB[name3] section=1/Special\n");
- expectedResult.append("string/attrC[name3] section=1/Special\n");
- expectedResult.append("string/attrD[name3] section=1/Special\n");
- expectedResult.append("string/attrE[name3] section=1/Special\n");
- expectedResult.append("string/attrF[name3] section=1/Special\n");
- /* imports */
- expectedResult.append("string/attr2[name1] section=1/Special\n");
- expectedResult.append("string/attr3[name1] section=1/Special\n");
- expectedResult.append("string/attr6[name1] section=1/Special\n");
- expectedResult.append("string/attr7[name1] section=1/Special\n");
- expectedResult.append("string/attr4[name2] section=1/Special\n");
- expectedResult.append("string/attr5[name2] section=1/Special\n");
- /* defaults */
- expectedResult.append("string/attr1[default] section=0/General\n");
- expectedResult.append("\n");
- check(typesXml.toString(), false, expectedResult.toString());
+ public void testImport2() throws ParserConfigurationException, IOException {
+ check("import2");
}
/**
* Checks that ignoring default attributes do work.
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
@Test
- public void testIgnoreDefaultAttribute1() throws ParserConfigurationException, UnsupportedEncodingException {
- final StringBuilder typesXml = new StringBuilder();
- typesXml.append("<bitmasks/>\n");
- typesXml.append("<lists/>\n");
- typesXml.append("<ignorelists/>\n");
- typesXml.append("<default_type>\n");
- typesXml.append("<attribute arch=\"default_attr1\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"default_attr2\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("</default_type>\n");
- typesXml.append("<type number=\"1\" name=\"name1\">\n");
- typesXml.append("<ignore>\n");
- typesXml.append("<attribute arch=\"default_attr1\"/>\n");
- typesXml.append("</ignore>\n");
- typesXml.append("<description>description1</description>\n");
- typesXml.append("</type>\n");
- final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("type:1,name1\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- /* imports */
- /* defaults */
- expectedResult.append("string/default_attr2[default] section=0/General\n");
- expectedResult.append("\n");
- check(typesXml.toString(), false, expectedResult.toString());
+ public void testIgnoreDefaultAttribute1() throws ParserConfigurationException, IOException {
+ check("ignoreDefaultAttribute1");
}
/**
* Checks that ignoring import attributes do work.
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
@Test
- public void testIgnoreImportAttribute1() throws ParserConfigurationException, UnsupportedEncodingException {
- final StringBuilder typesXml = new StringBuilder();
- typesXml.append("<bitmasks/>\n");
- typesXml.append("<lists/>\n");
- typesXml.append("<ignorelists/>\n");
- typesXml.append("<default_type>\n");
- typesXml.append("<attribute arch=\"default_attr1\" editor=\"default\" type=\"string\">description</attribute>\n");
- typesXml.append("</default_type>\n");
- typesXml.append("<type number=\"1\" name=\"name1\">\n");
- typesXml.append("<description>description1</description>\n");
- typesXml.append("<attribute arch=\"name1_attr1\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"name1_attr2\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("</type>\n");
- typesXml.append("<type number=\"2\" name=\"name2\">\n");
- typesXml.append("<import_type name=\"name1\"/>\n");
- typesXml.append("<ignore>\n");
- typesXml.append("<attribute arch=\"name1_attr1\"/>\n");
- typesXml.append("</ignore>\n");
- typesXml.append("<description>description2</description>\n");
- typesXml.append("</type>\n");
- final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("type:1,name1\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("string/name1_attr1[name1] section=1/Special\n");
- expectedResult.append("string/name1_attr2[name1] section=1/Special\n");
- expectedResult.append("string/default_attr1[default] section=0/General\n");
- expectedResult.append("\n");
- expectedResult.append("type:2,name2\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- /* imports */
- expectedResult.append("string/name1_attr1[name1] section=1/Special\n"); // imported attributes are not affected by ignores
- expectedResult.append("string/name1_attr2[name1] section=1/Special\n");
- /* defaults */
- expectedResult.append("string/default_attr1[default] section=0/General\n");
- expectedResult.append("\n");
- check(typesXml.toString(), false, expectedResult.toString());
+ public void testIgnoreImportAttribute1() throws ParserConfigurationException, IOException {
+ check("ignoreImportAttribute1");
}
/**
* Checks that ignoring defined attributes do work.
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
@Test
- public void testIgnoreDefinedAttribute1() throws ParserConfigurationException, UnsupportedEncodingException {
- final StringBuilder typesXml = new StringBuilder();
- typesXml.append("<bitmasks/>\n");
- typesXml.append("<lists/>\n");
- typesXml.append("<ignorelists/>\n");
- typesXml.append("<default_type/>\n");
- typesXml.append("<type number=\"1\" name=\"name1\">\n");
- typesXml.append("<ignore>\n");
- typesXml.append("<attribute arch=\"name1_attr1\"/>\n");
- typesXml.append("</ignore>\n");
- typesXml.append("<description>description1</description>\n");
- typesXml.append("<attribute arch=\"name1_attr1\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("<attribute arch=\"name1_attr2\" editor=\"name1\" type=\"string\">description</attribute>\n");
- typesXml.append("</type>\n");
- final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("type:1,name1\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- expectedResult.append("string/name1_attr1[name1] section=1/Special\n"); // defined attributes are not affected by ignores
- expectedResult.append("string/name1_attr2[name1] section=1/Special\n");
- /* imports */
- /* defaults */
- expectedResult.append("\n");
- check(typesXml.toString(), false, expectedResult.toString());
+ public void testIgnoreDefinedAttribute1() throws ParserConfigurationException, IOException {
+ check("ignoreDefinedAttribute1");
}
/**
* Checks that a "msg" field in default_type does work.
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
@Test
- public void testMsgDefault1() throws ParserConfigurationException, UnsupportedEncodingException {
- final StringBuilder typesXml = new StringBuilder();
- typesXml.append("<bitmasks/>\n");
- typesXml.append("<lists/>\n");
- typesXml.append("<ignorelists/>\n");
- typesXml.append("<default_type>\n");
- typesXml.append("<attribute arch_begin=\"msg\" arch_end=\"endmsg\" editor=\"default\" type=\"text\">msg</attribute>\n");
- typesXml.append("</default_type>\n");
- typesXml.append("<type number=\"1\" name=\"name1\">\n");
- typesXml.append("<description>description</description>\n");
- typesXml.append("</type>\n");
- final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("type:1,name1\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- /* imports */
- /* defaults */
- expectedResult.append("text/msg[default] section=2/default\n");
- expectedResult.append("\n");
- check(typesXml.toString(), false, expectedResult.toString());
+ public void testMsgDefault1() throws ParserConfigurationException, IOException {
+ check("msgDefault1");
}
/**
* Checks that a "msg" field in default_type does work.
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
@Test
- public void testMsgDefault2() throws ParserConfigurationException, UnsupportedEncodingException {
- final StringBuilder typesXml = new StringBuilder();
- typesXml.append("<bitmasks/>\n");
- typesXml.append("<lists/>\n");
- typesXml.append("<ignorelists/>\n");
- typesXml.append("<default_type>\n");
- typesXml.append("<attribute arch_begin=\"msg\" arch_end=\"endmsg\" editor=\"default\" type=\"text\">msg1</attribute>\n");
- typesXml.append("</default_type>\n");
- typesXml.append("<type number=\"1\" name=\"name1\">\n");
- typesXml.append("<description>description</description>\n");
- typesXml.append("<attribute arch_begin=\"msg\" arch_end=\"endmsg\" editor=\"name1\" type=\"text\">msg2</attribute>\n");
- typesXml.append("</type>\n");
- final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("type:1,name1\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- expectedResult.append("text/msg[name1] section=2/name1\n");
- /* imports */
- /* defaults */
- expectedResult.append("\n");
- check(typesXml.toString(), false, expectedResult.toString());
+ public void testMsgDefault2() throws ParserConfigurationException, IOException {
+ check("msgDefault2");
}
/**
* Checks that a "msg" field in default_type CAN BE "ignored".
* @throws ParserConfigurationException if the test fails
- * @throws UnsupportedEncodingException if the test fails
+ * @throws IOException if the test fails
*/
@Test
- public void testMsgDefault3() throws ParserConfigurationException, UnsupportedEncodingException {
- final StringBuilder typesXml = new StringBuilder();
- typesXml.append("<bitmasks/>\n");
- typesXml.append("<lists/>\n");
- typesXml.append("<ignorelists/>\n");
- typesXml.append("<default_type>\n");
- typesXml.append("<attribute arch_begin=\"msg\" arch_end=\"endmsg\" editor=\"default\" type=\"text\">msg1</attribute>\n");
- typesXml.append("</default_type>\n");
- typesXml.append("<type number=\"1\" name=\"name1\">\n");
- typesXml.append("<ignore>\n");
- typesXml.append("<attribute arch=\"msg\"/>\n");
- typesXml.append("</ignore>\n");
- typesXml.append("<description>description</description>\n");
- typesXml.append("</type>\n");
- final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("type:1,name1\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- /* imports */
- /* defaults */
- expectedResult.append("\n");
- check(typesXml.toString(), false, expectedResult.toString());
+ public void testMsgDefault3() throws ParserConfigurationException, IOException {
+ check("msgDefault3");
}
/**
* Checks that a types.xml file can be read.
- * @param typesXml the types.xml file contents
- * @param expectedHasErrors whether errors are expected
- * @param expectedResult the expected result
+ * @param name the base name of the resources to load
* @throws ParserConfigurationException if the test fails
* @throws UnsupportedEncodingException if the test fails
*/
- private void check(@NotNull final String typesXml, final boolean expectedHasErrors, @NotNull final String expectedResult) throws ParserConfigurationException, UnsupportedEncodingException {
+ private void check(@NotNull final String name) throws ParserConfigurationException, IOException {
final ArchetypeTypeSet archetypeTypeSet = new ArchetypeTypeSet();
final ArchetypeTypeSetParser parser = createArchetypeTypeSetParser(archetypeTypeSet);
- parser.loadTypesFromXML(errorViewCollector, createInputSource(typesXml));
- Assert.assertEquals(expectedHasErrors, errorView.hasErrors());
- Assert.assertEquals(expectedResult, archetypeTypeSet.toString());
+
+ final InputStream typesXml = getClass().getResourceAsStream("ArchetypeTypeSetParserTest-" + name + "-types.xml");
+ Assert.assertNotNull(typesXml);
+ final InputSource inputSource = new InputSource(typesXml);
+ inputSource.setSystemId("types.dtd");
+
+ parser.loadTypesFromXML(errorViewCollector, inputSource);
+
+ final InputStream is = getClass().getResourceAsStream("ArchetypeTypeSetParserTest-" + name + "-result.txt");
+ Assert.assertNotNull(is);
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final byte[] tmp = new byte[1024];
+ while (true) {
+ final int len = is.read(tmp);
+ if (len == -1) {
+ break;
+ }
+ baos.write(tmp, 0, len);
+ }
+ final String expectedResult = baos.toString("UTF-8");
+ Assert.assertEquals(expectedResult, "errors=" + errorView.hasErrors() + "\n" + archetypeTypeSet);
}
/**
@@ -483,24 +189,4 @@
return new ArchetypeTypeSetParser(xmlHelper.getDocumentBuilder(), archetypeTypeSet, archetypeTypeParser);
}
- /**
- * Creates an {@link InputSource} from a <code>String</code>.
- * @param string the string to wrap
- * @return the input stream
- * @throws UnsupportedEncodingException if the input stream cannot be
- * created
- */
- @NotNull
- private static InputSource createInputSource(@NotNull final String string) throws UnsupportedEncodingException {
- final StringBuilder typesString = new StringBuilder();
- typesString.append("<?xml version=\"1.0\" standalone=\"no\" ?>\n");
- typesString.append("<!DOCTYPE types SYSTEM \"types.dtd\">\n");
- typesString.append("<types>\n");
- typesString.append(string);
- typesString.append("</types>\n");
- final InputSource inputSource = new InputSource(new ByteArrayInputStream(typesString.toString().getBytes("UTF-8")));
- inputSource.setSystemId("types.dtd");
- return inputSource;
- }
-
}
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,6 @@
+errors=false
+type:1,name1
+:
+:
+string/default_attr2[default] section=0/General
+
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-result.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-types.xml
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-types.xml (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-types.xml 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,22 @@
+<?xml version="1.0" standalone="no" ?>
+
+<!DOCTYPE types SYSTEM "types.dtd">
+<types>
+ <bitmasks/>
+ <lists/>
+ <ignorelists/>
+ <default_type>
+ <attribute arch="default_attr1" editor="default" type="string">
+ description
+ </attribute>
+ <attribute arch="default_attr2" editor="default" type="string">
+ description
+ </attribute>
+ </default_type>
+ <type number="1" name="name1">
+ <ignore>
+ <attribute arch="default_attr1"/>
+ </ignore>
+ <description>description1</description>
+ </type>
+</types>
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefaultAttribute1-types.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,7 @@
+errors=false
+type:1,name1
+:
+:
+string/name1_attr1[name1] section=1/Special
+string/name1_attr2[name1] section=1/Special
+
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-result.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-types.xml
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-types.xml (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-types.xml 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,20 @@
+<?xml version="1.0" standalone="no" ?>
+
+<!DOCTYPE types SYSTEM "types.dtd">
+<types>
+ <bitmasks/>
+ <lists/>
+ <ignorelists/>
+ <default_type/>
+ <type number="1" name="name1">
+ <ignore>
+ <attribute arch="name1_attr1"/>
+ </ignore>
+ <description>description1</description>
+ <!-- defined attributes are not affected by ignores -->
+ <attribute arch="name1_attr1" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="name1_attr2" editor="name1" type="string">description
+ </attribute>
+ </type>
+</types>
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreDefinedAttribute1-types.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,15 @@
+errors=false
+type:1,name1
+:
+:
+string/name1_attr1[name1] section=1/Special
+string/name1_attr2[name1] section=1/Special
+string/default_attr1[default] section=0/General
+
+type:2,name2
+:
+:
+string/name1_attr1[name1] section=1/Special
+string/name1_attr2[name1] section=1/Special
+string/default_attr1[default] section=0/General
+
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-result.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-types.xml
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-types.xml (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-types.xml 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,28 @@
+<?xml version="1.0" standalone="no" ?>
+
+<!DOCTYPE types SYSTEM "types.dtd">
+<types>
+ <bitmasks/>
+ <lists/>
+ <ignorelists/>
+ <default_type>
+ <attribute arch="default_attr1" editor="default" type="string">
+ description
+ </attribute>
+ </default_type>
+ <type number="1" name="name1">
+ <description>description1</description>
+ <attribute arch="name1_attr1" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="name1_attr2" editor="name1" type="string">description
+ </attribute>
+ </type>
+ <type number="2" name="name2">
+ <import_type name="name1"/>
+ <ignore>
+ <!-- imported attributes are not affected by ignores -->
+ <attribute arch="name1_attr1"/>
+ </ignore>
+ <description>description2</description>
+ </type>
+</types>
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-ignoreImportAttribute1-types.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,18 @@
+errors=false
+type:1,name1
+:
+:
+string/name1_attr1[name1] section=1/Special
+string/name1_attr2[name1] section=1/Special
+string/default_attr1[default] section=0/General
+string/default_attr2[default] section=0/General
+
+type:2,name2
+:
+:
+string/name2_attr1[name2] section=1/Special
+string/name1_attr2[name2] section=1/Special
+string/default_attr2[name2] section=1/Special
+string/name1_attr1[name1] section=1/Special
+string/default_attr1[default] section=0/General
+
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-result.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-types.xml
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-types.xml (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-types.xml 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,33 @@
+<?xml version="1.0" standalone="no" ?>
+
+<!DOCTYPE types SYSTEM "types.dtd">
+<types>
+ <bitmasks/>
+ <lists/>
+ <ignorelists/>
+ <default_type>
+ <attribute arch="default_attr1" editor="default" type="string">
+ description
+ </attribute>
+ <attribute arch="default_attr2" editor="default" type="string">
+ description
+ </attribute>
+ </default_type>
+ <type number="1" name="name1">
+ <description>description1</description>
+ <attribute arch="name1_attr1" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="name1_attr2" editor="name1" type="string">description
+ </attribute>
+ </type>
+ <type number="2" name="name2">
+ <import_type name="name1"/>
+ <description>description2</description>
+ <attribute arch="name2_attr1" editor="name2" type="string">description
+ </attribute>
+ <attribute arch="name1_attr2" editor="name2" type="string">description
+ </attribute>
+ <attribute arch="default_attr2" editor="name2" type="string">description
+ </attribute>
+ </type>
+</types>
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import1-types.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,52 @@
+errors=false
+type:1,name1
+:
+:
+string/attr2[name1] section=1/Special
+string/attr3[name1] section=1/Special
+string/attr6[name1] section=1/Special
+string/attr7[name1] section=1/Special
+string/attrA[name1] section=1/Special
+string/attrB[name1] section=1/Special
+string/attrE[name1] section=1/Special
+string/attrF[name1] section=1/Special
+string/attr1[default] section=0/General
+string/attr5[default] section=0/General
+string/attr9[default] section=0/General
+string/attrD[default] section=0/General
+
+type:2,name2
+:
+:
+string/attr4[name2] section=1/Special
+string/attr5[name2] section=1/Special
+string/attr6[name2] section=1/Special
+string/attr7[name2] section=1/Special
+string/attrC[name2] section=1/Special
+string/attrD[name2] section=1/Special
+string/attrE[name2] section=1/Special
+string/attrF[name2] section=1/Special
+string/attr1[default] section=0/General
+string/attr3[default] section=0/General
+string/attr9[default] section=0/General
+string/attrB[default] section=0/General
+
+type:3,name3
+:
+:
+string/attr8[name3] section=1/Special
+string/attr9[name3] section=1/Special
+string/attrA[name3] section=1/Special
+string/attrB[name3] section=1/Special
+string/attrC[name3] section=1/Special
+string/attrD[name3] section=1/Special
+string/attrE[name3] section=1/Special
+string/attrF[name3] section=1/Special
+string/attr2[name1] section=1/Special
+string/attr3[name1] section=1/Special
+string/attr6[name1] section=1/Special
+string/attr7[name1] section=1/Special
+string/attr4[name2] section=1/Special
+string/attr5[name2] section=1/Special
+string/attr1[default] section=0/General
+
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-result.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-types.xml
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-types.xml (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-types.xml 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,85 @@
+<?xml version="1.0" standalone="no" ?>
+
+<!DOCTYPE types SYSTEM "types.dtd">
+<types>
+ <bitmasks/>
+ <lists/>
+ <ignorelists/>
+ <default_type>
+ <attribute arch="attr1" editor="default" type="string">description
+ </attribute>
+ <attribute arch="attr3" editor="default" type="string">description
+ </attribute>
+ <attribute arch="attr5" editor="default" type="string">description
+ </attribute>
+ <attribute arch="attr7" editor="default" type="string">description
+ </attribute>
+ <attribute arch="attr9" editor="default" type="string">description
+ </attribute>
+ <attribute arch="attrB" editor="default" type="string">description
+ </attribute>
+ <attribute arch="attrD" editor="default" type="string">description
+ </attribute>
+ <attribute arch="attrF" editor="default" type="string">description
+ </attribute>
+ </default_type>
+ <type number="1" name="name1">
+ <description>description1</description>
+ <attribute arch="attr2" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="attr3" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="attr6" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="attr7" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="attrA" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="attrB" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="attrE" editor="name1" type="string">description
+ </attribute>
+ <attribute arch="attrF" editor="name1" type="string">description
+ </attribute>
+ </type>
+ <type number="2" name="name2">
+ <description>description2</description>
+ <attribute arch="attr4" editor="name2" type="string">description
+ </attribute>
+ <attribute arch="attr5" editor="name2" type="string">description
+ </attribute>
+ <attribute arch="attr6" editor="name2" type="string">description
+ </attribute>
+ <attribute arch="attr7" editor="name2" type="string">description
+ </attribute>
+ <attribute arch="attrC" editor="name2" type="string">description
+ </attribute>
+ <attribute arch="attrD" editor="name2" type="string">description
+ </attribute>
+ <attribute arch="attrE" editor="name2" type="string">description
+ </attribute>
+ <attribute arch="attrF" editor="name2" type="string">description
+ </attribute>
+ </type>
+ <type number="3" name="name3">
+ <import_type name="name1"/>
+ <import_type name="name2"/>
+ <description>description3</description>
+ <attribute arch="attr8" editor="name3" type="string">description
+ </attribute>
+ <attribute arch="attr9" editor="name3" type="string">description
+ </attribute>
+ <attribute arch="attrA" editor="name3" type="string">description
+ </attribute>
+ <attribute arch="attrB" editor="name3" type="string">description
+ </attribute>
+ <attribute arch="attrC" editor="name3" type="string">description
+ </attribute>
+ <attribute arch="attrD" editor="name3" type="string">description
+ </attribute>
+ <attribute arch="attrE" editor="name3" type="string">description
+ </attribute>
+ <attribute arch="attrF" editor="name3" type="string">description
+ </attribute>
+ </type>
+</types>
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-import2-types.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,6 @@
+errors=false
+type:1,name1
+:
+:
+text/msg[default] section=2/default
+
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-result.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-types.xml
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-types.xml (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-types.xml 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,16 @@
+<?xml version="1.0" standalone="no" ?>
+
+<!DOCTYPE types SYSTEM "types.dtd">
+<types>
+ <bitmasks/>
+ <lists/>
+ <ignorelists/>
+ <default_type>
+ <attribute arch_begin="msg" arch_end="endmsg" editor="default" type="text">
+ msg
+ </attribute>
+ </default_type>
+ <type number="1" name="name1">
+ <description>description</description>
+ </type>
+</types>
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault1-types.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,6 @@
+errors=false
+type:1,name1
+:
+:
+text/msg[name1] section=2/name1
+
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-result.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-types.xml
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-types.xml (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-types.xml 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,19 @@
+<?xml version="1.0" standalone="no" ?>
+
+<!DOCTYPE types SYSTEM "types.dtd">
+<types>
+ <bitmasks/>
+ <lists/>
+ <ignorelists/>
+ <default_type>
+ <attribute arch_begin="msg" arch_end="endmsg" editor="default" type="text">
+ msg1
+ </attribute>
+ </default_type>
+ <type number="1" name="name1">
+ <description>description</description>
+ <attribute arch_begin="msg" arch_end="endmsg" editor="name1" type="text">
+ msg2
+ </attribute>
+ </type>
+</types>
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault2-types.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,5 @@
+errors=false
+type:1,name1
+:
+:
+
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-result.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-types.xml
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-types.xml (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-types.xml 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,19 @@
+<?xml version="1.0" standalone="no" ?>
+
+<!DOCTYPE types SYSTEM "types.dtd">
+<types>
+ <bitmasks/>
+ <lists/>
+ <ignorelists/>
+ <default_type>
+ <attribute arch_begin="msg" arch_end="endmsg" editor="default" type="text">
+ msg1
+ </attribute>
+ </default_type>
+ <type number="1" name="name1">
+ <ignore>
+ <attribute arch="msg"/>
+ </ignore>
+ <description>description</description>
+ </type>
+</types>
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-msgDefault3-types.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,7 @@
+errors=false
+type:123,name 123
+:
+:
+fixed/f[v] section=1/Special
+string/name[name_editor] section=0/General
+
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-result.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-types.xml
===================================================================
--- trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-types.xml (rev 0)
+++ trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-types.xml 2013-05-31 14:06:09 UTC (rev 9252)
@@ -0,0 +1,17 @@
+<?xml version="1.0" standalone="no" ?>
+
+<!DOCTYPE types SYSTEM "types.dtd">
+<types>
+ <bitmasks/>
+ <lists/>
+ <ignorelists/>
+ <default_type>
+ <attribute arch="name" editor="name_editor" type="string">name
+ description
+ </attribute>
+ </default_type>
+ <type number="123" name="name 123">
+ <description>description 123</description>
+ <attribute arch="f" value="v" type="fixed"/>
+ </type>
+</types>
Property changes on: trunk/src/model/src/test/resources/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest-test1-types.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-31 13:46:05
|
Revision: 9251
http://sourceforge.net/p/gridarta/code/9251
Author: akirschbaum
Date: 2013-05-31 13:46:02 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Fix incorrect resource directories.
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-05-31 11:57:31 UTC (rev 9250)
+++ trunk/build.xml 2013-05-31 13:46:02 UTC (rev 9251)
@@ -60,92 +60,74 @@
<path id="path.class.atrinik.app">
<pathelement location="${build.dir}/atrinik/app"/>
- <pathelement location="src/atrinik/src/main/resources"/>
</path>
<path id="path.class.atrinik.test">
<path refid="path.class.atrinik.app"/>
<pathelement location="${build.dir}/atrinik/test"/>
- <pathelement location="src/atrinik/src/test/resources"/>
</path>
<path id="path.class.crossfire.app">
<pathelement location="${build.dir}/crossfire/app"/>
- <pathelement location="src/crossfire/src/main/resources"/>
</path>
<path id="path.class.crossfire.test">
<path refid="path.class.crossfire.app"/>
<pathelement location="${build.dir}/crossfire/test"/>
- <pathelement location="src/crossfire/src/test/resources"/>
</path>
<path id="path.class.daimonin.app">
<pathelement location="${build.dir}/daimonin/app"/>
- <pathelement location="src/daimonin/src/main/resources"/>
</path>
<path id="path.class.daimonin.test">
<path refid="path.class.daimonin.app"/>
<pathelement location="${build.dir}/daimonin/test"/>
- <pathelement location="src/daimonin/src/test/resources"/>
</path>
<path id="path.class.gridarta.app">
<pathelement location="${build.dir}/gridarta/app"/>
- <pathelement location="src/gridarta/src/main/resources"/>
</path>
<path id="path.class.gridarta.test">
<path refid="path.class.gridarta.app"/>
<pathelement location="${build.dir}/gridarta/test"/>
- <pathelement location="src/gridarta/src/test/resources"/>
</path>
<path id="path.class.model.app">
<pathelement location="${build.dir}/model/app"/>
- <pathelement location="src/model/src/main/resources"/>
</path>
<path id="path.class.model.test">
<path refid="path.class.model.app"/>
<pathelement location="${build.dir}/model/test"/>
- <pathelement location="src/model/src/test/resources"/>
</path>
<path id="path.class.preferences.app">
<pathelement location="${build.dir}/preferences/app"/>
- <pathelement location="src/preferences/src/main/resources"/>
</path>
<path id="path.class.preferences.test">
<path refid="path.class.preferences.app"/>
<pathelement location="${build.dir}/preferences/test"/>
- <pathelement location="src/preferences/src/test/resources"/>
</path>
<path id="path.class.plugin.app">
<pathelement location="${build.dir}/plugin/app"/>
- <pathelement location="src/plugin/src/main/resources"/>
</path>
<path id="path.class.plugin.test">
<path refid="path.class.plugin.app"/>
<pathelement location="${build.dir}/plugin/test"/>
- <pathelement location="src/plugin/src/test/resources"/>
</path>
<path id="path.class.textedit.app">
<pathelement location="${build.dir}/textedit/app"/>
- <pathelement location="src/textedit/src/main/resources"/>
</path>
<path id="path.class.textedit.test">
<path refid="path.class.textedit.app"/>
<pathelement location="${build.dir}/textedit/test"/>
- <pathelement location="src/textedit/src/test/resources"/>
</path>
<path id="path.class.utils.app">
<pathelement location="${build.dir}/utils/app"/>
- <pathelement location="src/utils/src/main/resources"/>
</path>
<path id="path.class.utils.test">
<path refid="path.class.utils.app"/>
<pathelement location="${build.dir}/utils/test"/>
- <pathelement location="src/utils/src/test/resources"/>
</path>
<path id="path.lib.annotations" location="lib/annotations.jar"/>
@@ -226,13 +208,6 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="src/atrinik/src/main/resources"/>
- <fileset dir="src/gridarta/src/main/resources"/>
- <fileset dir="src/model/src/main/resources"/>
- <fileset dir="src/preferences/src/main/resources"/>
- <fileset dir="src/plugin/src/main/resources"/>
- <fileset dir="src/textedit/src/main/resources"/>
- <fileset dir="src/utils/src/main/resources"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -271,13 +246,6 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="src/crossfire/src/main/resources"/>
- <fileset dir="src/gridarta/src/main/resources"/>
- <fileset dir="src/model/src/main/resources"/>
- <fileset dir="src/preferences/src/main/resources"/>
- <fileset dir="src/plugin/src/main/resources"/>
- <fileset dir="src/textedit/src/main/resources"/>
- <fileset dir="src/utils/src/main/resources"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -316,13 +284,6 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="src/daimonin/src/main/resources"/>
- <fileset dir="src/gridarta/src/main/resources"/>
- <fileset dir="src/model/src/main/resources"/>
- <fileset dir="src/preferences/src/main/resources"/>
- <fileset dir="src/plugin/src/main/resources"/>
- <fileset dir="src/textedit/src/main/resources"/>
- <fileset dir="src/utils/src/main/resources"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -387,7 +348,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/atrinik/test">
- <fileset dir="src/atrinik/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/atrinik/src/test/resources"/>
</copy>
</target>
@@ -424,7 +385,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/crossfire/test">
- <fileset dir="src/crossfire/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/crossfire/src/test/resources"/>
</copy>
</target>
@@ -444,8 +405,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/daimonin/test">
- <fileset dir="src/daimonin/src/test/resources" includes="**/*.properties"/>
+ <copy todir="${build.dir}/daimonin/app">
+ <fileset dir="src/daimonin/src/main/resources"/>
</copy>
<mkdir dir="${build.dir}/daimonin/test"/>
<javac srcdir="src/daimonin/src/test/java" destdir="${build.dir}/daimonin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
@@ -458,8 +419,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/daimonin/app">
- <fileset dir="src/daimonin/src/main/resources"/>
+ <copy todir="${build.dir}/daimonin/test">
+ <fileset dir="src/daimonin/src/test/resources"/>
</copy>
</target>
@@ -488,8 +449,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/gridarta/test">
- <fileset dir="src/gridarta/src/test/resources" includes="**/*.properties,cfpython_menu.def"/>
+ <copy todir="${build.dir}/gridarta/app">
+ <fileset dir="src/gridarta/src/main/resources"/>
</copy>
<mkdir dir="${build.dir}/gridarta/test"/>
<javac srcdir="src/gridarta/src/test/java" destdir="${build.dir}/gridarta/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
@@ -505,8 +466,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/gridarta/app">
- <fileset dir="src/gridarta/src/main/resources"/>
+ <copy todir="${build.dir}/gridarta/test">
+ <fileset dir="src/gridarta/src/test/resources"/>
</copy>
</target>
@@ -525,8 +486,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/model/test">
- <fileset dir="src/model/src/test/resources" includes="**/*.properties"/>
+ <copy todir="${build.dir}/model/app">
+ <fileset dir="src/model/src/main/resources"/>
</copy>
<mkdir dir="${build.dir}/model/test"/>
<javac srcdir="src/model/src/test/java" destdir="${build.dir}/model/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
@@ -542,8 +503,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/model/app">
- <fileset dir="src/model/src/main/resources"/>
+ <copy todir="${build.dir}/model/test">
+ <fileset dir="src/model/src/test/resources"/>
</copy>
</target>
@@ -557,8 +518,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/preferences/test">
- <fileset dir="src/preferences/src/test/resources" includes="**/*.properties"/>
+ <copy todir="${build.dir}/preferences/app">
+ <fileset dir="src/preferences/src/main/resources"/>
</copy>
<mkdir dir="${build.dir}/preferences/test"/>
<javac srcdir="src/preferences/src/test/java" destdir="${build.dir}/preferences/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
@@ -567,8 +528,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/preferences/app">
- <fileset dir="src/preferences/src/main/resources"/>
+ <copy todir="${build.dir}/preferences/test">
+ <fileset dir="src/preferences/src/test/resources"/>
</copy>
</target>
@@ -586,8 +547,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/plugin/test">
- <fileset dir="src/plugin/src/test/resources" includes="**/*.properties"/>
+ <copy todir="${build.dir}/plugin/app">
+ <fileset dir="src/plugin/src/main/resources"/>
</copy>
<mkdir dir="${build.dir}/plugin/test"/>
<javac srcdir="src/plugin/src/test/java" destdir="${build.dir}/plugin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
@@ -596,8 +557,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/plugin/app">
- <fileset dir="src/plugin/src/main/resources"/>
+ <copy todir="${build.dir}/plugin/test">
+ <fileset dir="src/plugin/src/test/resources"/>
</copy>
</target>
@@ -612,8 +573,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/textedit/test">
- <fileset dir="src/textedit/src/test/resources" includes="**/*.properties"/>
+ <copy todir="${build.dir}/textedit/app">
+ <fileset dir="src/textedit/src/main/resources"/>
</copy>
<mkdir dir="${build.dir}/textedit/test"/>
<javac srcdir="src/textedit/src/test/java" destdir="${build.dir}/textedit/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
@@ -623,8 +584,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/textedit/app">
- <fileset dir="src/textedit/src/main/resources"/>
+ <copy todir="${build.dir}/textedit/test">
+ <fileset dir="src/textedit/src/test/resources"/>
</copy>
</target>
@@ -640,8 +601,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/utils/test">
- <fileset dir="src/utils/src/test/resources" includes="**/*.properties"/>
+ <copy todir="${build.dir}/utils/app">
+ <fileset dir="src/utils/src/main/resources"/>
</copy>
<mkdir dir="${build.dir}/utils/test"/>
<javac srcdir="src/utils/src/test/java" destdir="${build.dir}/utils/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
@@ -655,8 +616,8 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/utils/app">
- <fileset dir="src/utils/src/main/resources"/>
+ <copy todir="${build.dir}/utils/test">
+ <fileset dir="src/utils/src/test/resources"/>
</copy>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-31 11:57:38
|
Revision: 9250
http://sourceforge.net/p/gridarta/code/9250
Author: akirschbaum
Date: 2013-05-31 11:57:31 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Add nullable annotations.
Modified Paths:
--------------
trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
Modified: trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
===================================================================
--- trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2013-05-31 09:02:44 UTC (rev 9249)
+++ trunk/src/model/src/test/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2013-05-31 11:57:31 UTC (rev 9250)
@@ -41,11 +41,13 @@
/**
* The {@link ErrorView} used for parsing.
*/
+ @NotNull
private final ErrorView errorView = new TestErrorView();
/**
* The {@link ErrorViewCollector} used for parsing.
*/
+ @NotNull
private final ErrorViewCollector errorViewCollector = new ErrorViewCollector(errorView, new File("*input*"));
/**
@@ -458,7 +460,7 @@
* @throws ParserConfigurationException if the test fails
* @throws UnsupportedEncodingException if the test fails
*/
- private void check(final String typesXml, final boolean expectedHasErrors, final String expectedResult) throws ParserConfigurationException, UnsupportedEncodingException {
+ private void check(@NotNull final String typesXml, final boolean expectedHasErrors, @NotNull final String expectedResult) throws ParserConfigurationException, UnsupportedEncodingException {
final ArchetypeTypeSet archetypeTypeSet = new ArchetypeTypeSet();
final ArchetypeTypeSetParser parser = createArchetypeTypeSetParser(archetypeTypeSet);
parser.loadTypesFromXML(errorViewCollector, createInputSource(typesXml));
@@ -472,7 +474,8 @@
* @return the archetype type set parser instance
* @throws ParserConfigurationException if the parser cannot be created
*/
- private static ArchetypeTypeSetParser createArchetypeTypeSetParser(final ArchetypeTypeSet archetypeTypeSet) throws ParserConfigurationException {
+ @NotNull
+ private static ArchetypeTypeSetParser createArchetypeTypeSetParser(@NotNull final ArchetypeTypeSet archetypeTypeSet) throws ParserConfigurationException {
final XmlHelper xmlHelper = new XmlHelper();
final ArchetypeAttributeFactory archetypeAttributeFactory = new TestArchetypeAttributeFactory();
final ArchetypeAttributeParser archetypeAttributeParser = new ArchetypeAttributeParser(archetypeAttributeFactory);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-31 09:02:50
|
Revision: 9249
http://sourceforge.net/p/gridarta/code/9249
Author: akirschbaum
Date: 2013-05-31 09:02:44 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Fix typo.
Modified Paths:
--------------
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java 2013-05-31 08:46:18 UTC (rev 9248)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java 2013-05-31 09:02:44 UTC (rev 9249)
@@ -116,7 +116,7 @@
}
/**
- * Adds all attributes of am {@link ArchetypeType} to an {@link
+ * Adds all attributes of an {@link ArchetypeType} to an {@link
* ArchetypeAttributeSection} that are not ignored.
* @param archetypeType the archetype type
* @param attributeSection the archetype attributes to add to
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-31 08:46:23
|
Revision: 9248
http://sourceforge.net/p/gridarta/code/9248
Author: akirschbaum
Date: 2013-05-31 08:46:18 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Reorder attributes in types.xml. [Crossfire]
Modified Paths:
--------------
trunk/src/crossfire/src/main/resources/resource/conf/types.xml
Modified: trunk/src/crossfire/src/main/resources/resource/conf/types.xml
===================================================================
--- trunk/src/crossfire/src/main/resources/resource/conf/types.xml 2013-05-31 07:31:21 UTC (rev 9247)
+++ trunk/src/crossfire/src/main/resources/resource/conf/types.xml 2013-05-31 08:46:18 UTC (rev 9248)
@@ -2227,6 +2227,19 @@
<attribute arch="move_block" editor="blocked movement" type="bitmask_movement">
If set, the object cannot be passed by players nor monsters.
</attribute>
+ <attribute arch="no_magic" editor="no spells" type="bool">
+ If enabled, it is impossible for players to use (wizard-) spells on
+ that spot.
+ </attribute>
+ <attribute arch="damned" editor="no prayers" type="bool">
+ If enabled, it is impossible for players to use prayers on that
+ spot. It also prevents players from saving.
+ </attribute>
+ <attribute arch="unique" editor="unique map" type="bool">
+ Unique floor means that any items dropped on that spot will be saved
+ beyond map reset. For permanent apartments, all floor squares must
+ be set <unique map>.
+ </attribute>
<section name="terrain">
<attribute arch="move_slow" editor="slow movement" type="bitmask_movement">
The movement types that are affected by <slow penalty>.
@@ -2248,19 +2261,6 @@
Players with activated mountaineer skill can move faster here.
</attribute>
</section>
- <attribute arch="no_magic" editor="no spells" type="bool">
- If enabled, it is impossible for players to use (wizard-) spells on
- that spot.
- </attribute>
- <attribute arch="damned" editor="no prayers" type="bool">
- If enabled, it is impossible for players to use prayers on that
- spot. It also prevents players from saving.
- </attribute>
- <attribute arch="unique" editor="unique map" type="bool">
- Unique floor means that any items dropped on that spot will be saved
- beyond map reset. For permanent apartments, all floor squares must
- be set <unique map>.
- </attribute>
<attribute arch_begin="msg" arch_end="endmsg" editor="description" type="text">
This text may describe the object.
</attribute>
@@ -2284,6 +2284,19 @@
<attribute arch="move_block" editor="blocked movement" type="bitmask_movement">
If set, the object cannot be passed by players nor monsters.
</attribute>
+ <attribute arch="no_magic" editor="no spells" type="bool">
+ If enabled, it is impossible for players to use (wizard-) spells on
+ that spot.
+ </attribute>
+ <attribute arch="damned" editor="no prayers" type="bool">
+ If enabled, it is impossible for players to use prayers on that
+ spot. It also prevents players from saving.
+ </attribute>
+ <attribute arch="unique" editor="unique map" type="bool">
+ Unique floor means that any items dropped on that spot will be saved
+ beyond map reset. For permanent apartments, all floor squares must
+ be set <unique map>.
+ </attribute>
<section name="terrain">
<attribute arch="move_slow" editor="slow movement" type="bitmask_movement">
The movement types that are affected by <slow penalty>.
@@ -2305,19 +2318,6 @@
Players with activated mountaineer skill can move faster here.
</attribute>
</section>
- <attribute arch="no_magic" editor="no spells" type="bool">
- If enabled, it is impossible for players to use (wizard-) spells on
- that spot.
- </attribute>
- <attribute arch="damned" editor="no prayers" type="bool">
- If enabled, it is impossible for players to use prayers on that
- spot. It also prevents players from saving.
- </attribute>
- <attribute arch="unique" editor="unique map" type="bool">
- Unique floor means that any items dropped on that spot will be saved
- beyond map reset. For permanent apartments, all floor squares must
- be set <unique map>.
- </attribute>
<attribute arch_begin="msg" arch_end="endmsg" editor="description" type="text">
This text may describe the object.
</attribute>
@@ -2545,6 +2545,19 @@
But in fact, it does not seem to have an effect. Set any non-zero
value to be on the safe side.
</attribute>
+ <attribute arch="no_magic" editor="no spells" type="bool">
+ If enabled, it is impossible for players to use (wizard-) spells on
+ that spot.
+ </attribute>
+ <attribute arch="damned" editor="no prayers" type="bool">
+ If enabled, it is impossible for players to use prayers on that
+ spot. It also prevents players from saving.
+ </attribute>
+ <attribute arch="unique" editor="unique map" type="bool">
+ Unique floor means that any items dropped on that spot will be saved
+ beyond map reset. For permanent apartments, all floor squares must
+ be set <unique map>.
+ </attribute>
<section name="terrain">
<attribute arch="move_slow" editor="slow movement" type="bitmask_movement">
The movement types that are affected by <slow penalty>.
@@ -2570,19 +2583,6 @@
Players with activated mountaineer skill can move faster here.
</attribute>
</section>
- <attribute arch="no_magic" editor="no spells" type="bool">
- If enabled, it is impossible for players to use (wizard-) spells on
- that spot.
- </attribute>
- <attribute arch="damned" editor="no prayers" type="bool">
- If enabled, it is impossible for players to use prayers on that
- spot. It also prevents players from saving.
- </attribute>
- <attribute arch="unique" editor="unique map" type="bool">
- Unique floor means that any items dropped on that spot will be saved
- beyond map reset. For permanent apartments, all floor squares must
- be set <unique map>.
- </attribute>
</type>
<!--####################################################################-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-31 07:31:30
|
Revision: 9247
http://sourceforge.net/p/gridarta/code/9247
Author: akirschbaum
Date: 2013-05-31 07:31:21 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Suppress incorrect warning about Javadoc issue.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java 2013-05-30 22:47:31 UTC (rev 9246)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java 2013-05-31 07:31:21 UTC (rev 9247)
@@ -121,6 +121,7 @@
/**
* The {@link MapDesktop.MapViewFrameListener MapViewFrameListeners}
* associated with {@link MapView MapViews}. Maps map view to listener.
+ * @noinspection UnnecessarilyQualifiedInnerClassAccess
*/
@NotNull
private final Map<MapView<G, A, R>, MapViewFrameListener> mapViewFrameListeners = new IdentityHashMap<MapView<G, A, R>, MapViewFrameListener>();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-30 22:47:36
|
Revision: 9246
http://sourceforge.net/p/gridarta/code/9246
Author: akirschbaum
Date: 2013-05-30 22:47:31 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Move inner classes of ValidationError to top-level.
Modified Paths:
--------------
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/ValidationError.java
Added Paths:
-----------
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/Formatter.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/GameObjectFormatter.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/MapSquareFormatter.java
Added: trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/Formatter.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/Formatter.java (rev 0)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/Formatter.java 2013-05-30 22:47:31 UTC (rev 9246)
@@ -0,0 +1,44 @@
+/*
+ * 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.model.validation.errors;
+
+import java.io.Serializable;
+import java.util.Comparator;
+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 formatting objects.
+ * @param <O> the object type to format
+ * @author Andreas Kirschbaum
+ */
+public interface Formatter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, O> extends Comparator<O>, Serializable {
+
+ /**
+ * Returns a string representation of an object.
+ * @param obj the object
+ * @return the string representation
+ */
+ @NotNull
+ String toString(@NotNull O obj);
+
+}
Property changes on: trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/Formatter.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/GameObjectFormatter.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/GameObjectFormatter.java (rev 0)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/GameObjectFormatter.java 2013-05-30 22:47:31 UTC (rev 9246)
@@ -0,0 +1,49 @@
+/*
+ * 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.model.validation.errors;
+
+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;
+
+/**
+ * A {@link Formatter} for {@link GameObject GameObjects}.
+ * @author Andreas Kirschbaum
+ */
+public class GameObjectFormatter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements Formatter<G, A, R, G> {
+
+ /**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ @NotNull
+ @Override
+ public String toString(@NotNull final G obj) {
+ return obj.getBestName();
+ }
+
+ @Override
+ public int compare(@NotNull final G o1, @NotNull final G o2) {
+ return toString(o1).compareTo(toString(o2));
+ }
+
+}
Property changes on: trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/GameObjectFormatter.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/MapSquareFormatter.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/MapSquareFormatter.java (rev 0)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/MapSquareFormatter.java 2013-05-30 22:47:31 UTC (rev 9246)
@@ -0,0 +1,66 @@
+/*
+ * 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.model.validation.errors;
+
+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.model.mapmodel.MapSquare;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link Formatter} for {@link MapSquare MapSquares}.
+ * @author Andreas Kirschbaum
+ */
+public class MapSquareFormatter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements Formatter<G, A, R, MapSquare<G, A, R>> {
+
+ /**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ @NotNull
+ @Override
+ public String toString(@NotNull final MapSquare<G, A, R> obj) {
+ return obj.getMapX() + "|" + obj.getMapY();
+ }
+
+ @Override
+ public int compare(@NotNull final MapSquare<G, A, R> o1, @NotNull final MapSquare<G, A, R> o2) {
+ final int y1 = o1.getMapY();
+ final int y2 = o2.getMapY();
+ if (y1 < y2) {
+ return -1;
+ } else if (y1 > y2) {
+ return +1;
+ }
+
+ final int x1 = o1.getMapX();
+ final int x2 = o2.getMapX();
+ if (x1 < x2) {
+ return -1;
+ } else if (x1 > x2) {
+ return +1;
+ }
+
+ return 0;
+ }
+
+}
Property changes on: trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/MapSquareFormatter.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/ValidationError.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/ValidationError.java 2013-05-30 22:17:39 UTC (rev 9245)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/ValidationError.java 2013-05-30 22:47:31 UTC (rev 9246)
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
@@ -94,20 +93,20 @@
private final List<G> gameObjects = new ArrayList<G>(0);
/**
- * The {@link ValidationError.MapSquareFormatter} for formatting {@link
+ * The {@link MapSquareFormatter} for formatting {@link
* MapSquare} instances.
* @serial
*/
@NotNull
- private final MapSquareFormatter mapSquareFormatter = new MapSquareFormatter();
+ private final Formatter<G, A, R, MapSquare<G, A, R>> mapSquareFormatter = new MapSquareFormatter<G, A, R>();
/**
- * The {@link ValidationError.MapSquareFormatter} for formatting {@link
+ * The {@link MapSquareFormatter} for formatting {@link
* GameObject} instances.
* @serial
*/
@NotNull
- private final GameObjectFormatter gameObjectFormatter = new GameObjectFormatter();
+ private final Formatter<G, A, R, G> gameObjectFormatter = new GameObjectFormatter<G, A, R>();
/**
* Creates a new instance. The key is generated from the validator's name,
@@ -282,7 +281,7 @@
* @param postfix the postfix to append to the objects
* @param maxObjects the maximum number of objects to show
*/
- private static <O> void appendObjects(@NotNull final StringBuilder sb, @NotNull final Collection<O> objects, @NotNull final Formatter<O> formatter, @NotNull final String prefix, @NotNull final String postfix, final int maxObjects) {
+ private <O> void appendObjects(@NotNull final StringBuilder sb, @NotNull final Collection<O> objects, @NotNull final Formatter<G, A, R, O> formatter, @NotNull final String prefix, @NotNull final String postfix, final int maxObjects) {
if (objects.isEmpty()) {
return;
}
@@ -306,85 +305,4 @@
sb.append(postfix);
}
- /**
- * Interface for formatting objects.
- * @param <O> the object type to format
- * @author Andreas Kirschbaum
- */
- private interface Formatter<O> extends Comparator<O>, Serializable {
-
- /**
- * Returns a string representation of an object.
- * @param obj the object
- * @return the string representation
- */
- @NotNull
- String toString(@NotNull O obj);
-
- }
-
- /**
- * A {@link Formatter} for {@link GameObject GameObjects}.
- * @author Andreas Kirschbaum
- */
- private class GameObjectFormatter implements Formatter<G> {
-
- /**
- * The serial version UID.
- */
- private static final long serialVersionUID = 1L;
-
- @NotNull
- @Override
- public String toString(@NotNull final G obj) {
- return obj.getBestName();
- }
-
- @Override
- public int compare(@NotNull final G o1, @NotNull final G o2) {
- return toString(o1).compareTo(toString(o2));
- }
-
- }
-
- /**
- * A {@link Formatter} for {@link MapSquare MapSquares}.
- * @author Andreas Kirschbaum
- */
- private class MapSquareFormatter implements Formatter<MapSquare<G, A, R>> {
-
- /**
- * The serial version UID.
- */
- private static final long serialVersionUID = 1L;
-
- @NotNull
- @Override
- public String toString(@NotNull final MapSquare<G, A, R> obj) {
- return obj.getMapX() + "|" + obj.getMapY();
- }
-
- @Override
- public int compare(@NotNull final MapSquare<G, A, R> o1, @NotNull final MapSquare<G, A, R> o2) {
- final int y1 = o1.getMapY();
- final int y2 = o2.getMapY();
- if (y1 < y2) {
- return -1;
- } else if (y1 > y2) {
- return +1;
- }
-
- final int x1 = o1.getMapX();
- final int x2 = o2.getMapX();
- if (x1 < x2) {
- return -1;
- } else if (x1 > x2) {
- return +1;
- }
-
- return 0;
- }
-
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-30 22:17:45
|
Revision: 9245
http://sourceforge.net/p/gridarta/code/9245
Author: akirschbaum
Date: 2013-05-30 22:17:39 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Fix Javadoc issues.
Modified Paths:
--------------
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/TilePanel.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/ValidationError.java
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/TilePanel.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/TilePanel.java 2013-05-30 18:28:46 UTC (rev 9244)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/TilePanel.java 2013-05-30 22:17:39 UTC (rev 9245)
@@ -93,7 +93,7 @@
private final JTextField textField;
/**
- * The {@link RASwitch}.
+ * The {@link TilePanel.RASwitch}.
*/
@NotNull
private final RASwitch raSwitch;
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java 2013-05-30 18:28:46 UTC (rev 9244)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java 2013-05-30 22:17:39 UTC (rev 9245)
@@ -119,8 +119,8 @@
private final Map<MapView<G, A, R>, WindowAction<G, A, R>> windowActions = new IdentityHashMap<MapView<G, A, R>, WindowAction<G, A, R>>();
/**
- * The {@link MapViewFrameListener MapViewFrameListeners} associated with
- * {@link MapView MapViews}. Maps map view to listener.
+ * The {@link MapDesktop.MapViewFrameListener MapViewFrameListeners}
+ * associated with {@link MapView MapViews}. Maps map view to listener.
*/
@NotNull
private final Map<MapView<G, A, R>, MapViewFrameListener> mapViewFrameListeners = new IdentityHashMap<MapView<G, A, R>, MapViewFrameListener>();
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/ValidationError.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/ValidationError.java 2013-05-30 18:28:46 UTC (rev 9244)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/validation/errors/ValidationError.java 2013-05-30 22:17:39 UTC (rev 9245)
@@ -94,14 +94,16 @@
private final List<G> gameObjects = new ArrayList<G>(0);
/**
- * The {@link Formatter} for formatting {@link MapSquare} instances.
+ * The {@link ValidationError.MapSquareFormatter} for formatting {@link
+ * MapSquare} instances.
* @serial
*/
@NotNull
private final MapSquareFormatter mapSquareFormatter = new MapSquareFormatter();
/**
- * The {@link Formatter} for formatting {@link GameObject} instances.
+ * The {@link ValidationError.MapSquareFormatter} for formatting {@link
+ * GameObject} instances.
* @serial
*/
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-30 18:28:49
|
Revision: 9244
http://sourceforge.net/p/gridarta/code/9244
Author: akirschbaum
Date: 2013-05-30 18:28:46 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Remove always undefined property name from build.properties.
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-05-30 17:10:37 UTC (rev 9243)
+++ trunk/build.xml 2013-05-30 18:28:46 UTC (rev 9244)
@@ -350,7 +350,6 @@
<propertyref prefix="build.developer"/>
<propertyref prefix="build.number"/>
<propertyref prefix="build.tstamp"/>
- <propertyref prefix="svnversion"/>
</propertyset>
</echoproperties>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-30 17:10:44
|
Revision: 9243
http://sourceforge.net/p/gridarta/code/9243
Author: akirschbaum
Date: 2013-05-30 17:10:37 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Move checkstyle.xml to new directory.
Modified Paths:
--------------
trunk/build.xml
Added Paths:
-----------
trunk/config/
trunk/config/checkstyle/
trunk/config/checkstyle/checkstyle.xml
Removed Paths:
-------------
trunk/src/gridarta/src/checkstyle.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-05-30 16:18:01 UTC (rev 9242)
+++ trunk/build.xml 2013-05-30 17:10:37 UTC (rev 9243)
@@ -907,7 +907,7 @@
<target name="checkstyle" description="Runs checkstyle to style-check the source code">
<taskdef resource="checkstyletask.properties" classpath="lib/checkstyle-all-5.0.jar"/>
<mkdir dir="${build.dir}/doc"/>
- <checkstyle config="src/gridarta/src/checkstyle.xml" failOnViolation="true">
+ <checkstyle config="config/checkstyle/checkstyle.xml" failOnViolation="true">
<formatter type="plain" tofile="${build.dir}/doc/checkstyle_report.txt"/>
<formatter type="plain"/>
<fileset dir="src/gridarta/src/main/java" includes="**/*.java"/>
Copied: trunk/config/checkstyle/checkstyle.xml (from rev 9240, trunk/src/gridarta/src/checkstyle.xml)
===================================================================
--- trunk/config/checkstyle/checkstyle.xml (rev 0)
+++ trunk/config/checkstyle/checkstyle.xml 2013-05-30 17:10:37 UTC (rev 9243)
@@ -0,0 +1,112 @@
+<?xml version="1.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.
+ -->
+
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+ <!-- Checks that a package-info.java file exists for each package. --><!-- <module name="JavadocPackage"/> -->
+
+ <!-- Checks whether files end with a new line. -->
+ <module name="NewlineAtEndOfFile"/>
+
+ <!-- Checks that property files contain the same keys. -->
+ <module name="Translation"/>
+
+ <!-- Checks for Size Violations. -->
+ <module name="FileLength"/>
+
+ <!-- Checks for whitespace -->
+ <module name="FileTabCharacter"/>
+
+ <!-- Miscellaneous other checks. -->
+ <module name="RegexpSingleline">
+ <property name="format" value="\s+$"/>
+ <property name="minimum" value="0"/>
+ <property name="maximum" value="0"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+
+ <module name="TreeWalker">
+
+ <!-- Checks for Javadoc comments. --><!-- <module name="JavadocMethod"/> --><!-- <module name="JavadocType"/> --><!-- <module name="JavadocVariable"/> --><!-- <module name="JavadocStyle"/> -->
+
+ <!-- Checks for Naming Conventions. --><!-- <module name="ConstantName"/> -->
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+ <!-- Checks for Headers --><!-- <module name="Header"> --><!-- </module> -->
+
+ <!-- Checks for imports -->
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+ <!-- Checks for Size Violations. --><!-- <module name="LineLength"/> --><!-- <module name="MethodLength"/> --><!-- <module name="ParameterNumber"/> -->
+
+ <!-- Checks for whitespace -->
+ <module name="EmptyForIteratorPad"/>
+ <module name="GenericWhitespace"/>
+ <module name="MethodParamPad"/>
+ <!-- <module name="NoWhitespaceAfter"/> -->
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+
+ <!-- Modifier Checks -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+ <!-- Checks for blocks. You know, those {}'s --><!-- <module name="AvoidNestedBlocks"/> --><!-- <module name="EmptyBlock"/> -->
+ <module name="LeftCurly"/>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+
+ <!-- Checks for common coding problems --><!-- <module name="AvoidInlineConditionals"/> -->
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <!-- <module name="HiddenField"/> -->
+ <module name="IllegalInstantiation"/>
+ <!-- <module name="InnerAssignment"/> --><!-- <module name="MagicNumber"/> --><!-- <module name="MissingSwitchDefault"/> --><!-- <module name="RedundantThrows"/> -->
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+
+ <!-- Checks for class design --><!-- <module name="DesignForExtension"/> --><!-- <module name="FinalClass"/> --><!-- <module name="HideUtilityClassConstructor"/> --><!-- <module name="InterfaceIsType"/> --><!-- <module name="VisibilityModifier"/> -->
+
+ <!-- Miscellaneous other checks. -->
+ <module name="ArrayTypeStyle"/>
+ <module name="FinalParameters"/>
+ <!-- <module name="TodoComment"/> -->
+ <module name="UpperEll"/>
+
+ </module>
+
+</module>
Deleted: trunk/src/gridarta/src/checkstyle.xml
===================================================================
--- trunk/src/gridarta/src/checkstyle.xml 2013-05-30 16:18:01 UTC (rev 9242)
+++ trunk/src/gridarta/src/checkstyle.xml 2013-05-30 17:10:37 UTC (rev 9243)
@@ -1,112 +0,0 @@
-<?xml version="1.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.
- -->
-
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module name="Checker">
- <!-- Checks that a package-info.java file exists for each package. --><!-- <module name="JavadocPackage"/> -->
-
- <!-- Checks whether files end with a new line. -->
- <module name="NewlineAtEndOfFile"/>
-
- <!-- Checks that property files contain the same keys. -->
- <module name="Translation"/>
-
- <!-- Checks for Size Violations. -->
- <module name="FileLength"/>
-
- <!-- Checks for whitespace -->
- <module name="FileTabCharacter"/>
-
- <!-- Miscellaneous other checks. -->
- <module name="RegexpSingleline">
- <property name="format" value="\s+$"/>
- <property name="minimum" value="0"/>
- <property name="maximum" value="0"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
-
- <module name="TreeWalker">
-
- <!-- Checks for Javadoc comments. --><!-- <module name="JavadocMethod"/> --><!-- <module name="JavadocType"/> --><!-- <module name="JavadocVariable"/> --><!-- <module name="JavadocStyle"/> -->
-
- <!-- Checks for Naming Conventions. --><!-- <module name="ConstantName"/> -->
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
-
- <!-- Checks for Headers --><!-- <module name="Header"> --><!-- </module> -->
-
- <!-- Checks for imports -->
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
- <!-- Checks for Size Violations. --><!-- <module name="LineLength"/> --><!-- <module name="MethodLength"/> --><!-- <module name="ParameterNumber"/> -->
-
- <!-- Checks for whitespace -->
- <module name="EmptyForIteratorPad"/>
- <module name="GenericWhitespace"/>
- <module name="MethodParamPad"/>
- <!-- <module name="NoWhitespaceAfter"/> -->
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
-
- <!-- Modifier Checks -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
- <!-- Checks for blocks. You know, those {}'s --><!-- <module name="AvoidNestedBlocks"/> --><!-- <module name="EmptyBlock"/> -->
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
-
- <!-- Checks for common coding problems --><!-- <module name="AvoidInlineConditionals"/> -->
- <module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <!-- <module name="HiddenField"/> -->
- <module name="IllegalInstantiation"/>
- <!-- <module name="InnerAssignment"/> --><!-- <module name="MagicNumber"/> --><!-- <module name="MissingSwitchDefault"/> --><!-- <module name="RedundantThrows"/> -->
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
-
- <!-- Checks for class design --><!-- <module name="DesignForExtension"/> --><!-- <module name="FinalClass"/> --><!-- <module name="HideUtilityClassConstructor"/> --><!-- <module name="InterfaceIsType"/> --><!-- <module name="VisibilityModifier"/> -->
-
- <!-- Miscellaneous other checks. -->
- <module name="ArrayTypeStyle"/>
- <module name="FinalParameters"/>
- <!-- <module name="TodoComment"/> -->
- <module name="UpperEll"/>
-
- </module>
-
-</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-30 16:18:05
|
Revision: 9242
http://sourceforge.net/p/gridarta/code/9242
Author: akirschbaum
Date: 2013-05-30 16:18:01 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Allow to reinitialize FilePreferencesFactory.
Modified Paths:
--------------
trunk/src/preferences/src/main/java/net/sf/gridarta/preferences/FilePreferencesFactory.java
Modified: trunk/src/preferences/src/main/java/net/sf/gridarta/preferences/FilePreferencesFactory.java
===================================================================
--- trunk/src/preferences/src/main/java/net/sf/gridarta/preferences/FilePreferencesFactory.java 2013-05-30 16:17:25 UTC (rev 9241)
+++ trunk/src/preferences/src/main/java/net/sf/gridarta/preferences/FilePreferencesFactory.java 2013-05-30 16:18:01 UTC (rev 9242)
@@ -50,10 +50,6 @@
* not use a backing file
*/
public static void initialize(@NotNull final String defaultName, @Nullable final File file) {
- if (userRoot != null || systemRoot != null) {
- throw new IllegalStateException();
- }
-
final Storage storage = new Storage(defaultName, file);
userRoot = new FilePreferencesRoot(NodeType.USER, storage);
systemRoot = new FilePreferencesRoot(NodeType.SYSTEM, storage);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-30 16:17:29
|
Revision: 9241
http://sourceforge.net/p/gridarta/code/9241
Author: akirschbaum
Date: 2013-05-30 16:17:25 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Disable warnings about missing static field initialization.
Modified Paths:
--------------
trunk/gridarta.ipr
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-05-30 09:08:33 UTC (rev 9240)
+++ trunk/gridarta.ipr 2013-05-30 16:17:25 UTC (rev 9241)
@@ -757,18 +757,12 @@
<option name="m_maxLength" value="64" />
</inspection_tool>
<inspection_tool class="StaticSuite" enabled="true" level="WARNING" enabled_by_default="true" />
- <inspection_tool class="StaticVariableInitialization" enabled="true" level="WARNING" enabled_by_default="true">
- <option name="m_ignorePrimitives" value="false" />
- </inspection_tool>
<inspection_tool class="StaticVariableNamingConvention" enabled="true" level="WARNING" enabled_by_default="true">
<option name="checkMutableFinals" value="false" />
<option name="m_regex" value="[a-z][A-Za-z\d]*" />
<option name="m_minLength" value="3" />
<option name="m_maxLength" value="32" />
</inspection_tool>
- <inspection_tool class="StaticVariableUninitializedUse" enabled="true" level="WARNING" enabled_by_default="true">
- <option name="m_ignorePrimitives" value="false" />
- </inspection_tool>
<inspection_tool class="StringBufferReplaceableByString" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="StringConcatenationInLoops" enabled="false" level="WARNING" enabled_by_default="false">
<option name="m_ignoreUnlessAssigned" value="false" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-30 09:08:40
|
Revision: 9240
http://sourceforge.net/p/gridarta/code/9240
Author: akirschbaum
Date: 2013-05-30 09:08:33 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Move toolbar icons into correct directory.
Added Paths:
-----------
trunk/src/gridarta/src/main/resources/toolbarButtonGraphics/
trunk/src/gridarta/src/main/resources/toolbarButtonGraphics/misc/
Removed Paths:
-------------
trunk/src/gridarta/src/main/resources/misc/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-28 21:57:33
|
Revision: 9239
http://sourceforge.net/p/gridarta/code/9239
Author: akirschbaum
Date: 2013-05-28 21:57:28 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Move resource files into resources directories.
Modified Paths:
--------------
trunk/build.xml
trunk/gridarta.ipr
trunk/src/atrinik/atrinik.iml
trunk/src/atrinik/src/main/resources/HelpFiles/tut_DScript.html
trunk/src/crossfire/crossfire.iml
trunk/src/crossfire/src/main/resources/resource/HelpFiles/tut_map.html
trunk/src/crossfire/src/main/resources/resource/HelpFiles/tut_mapattr.html
trunk/src/daimonin/daimonin.iml
trunk/src/daimonin/src/main/resources/HelpFiles/tut_DScript.html
trunk/src/gridarta/gridarta.iml
Added Paths:
-----------
trunk/src/atrinik/src/main/resources/HelpFiles/
trunk/src/atrinik/src/main/resources/icons/
trunk/src/atrinik/src/main/resources/system/
trunk/src/crossfire/src/main/resources/gridarta-crossfire.png
trunk/src/crossfire/src/main/resources/icons/
trunk/src/crossfire/src/main/resources/resource/
trunk/src/crossfire/src/main/resources/system/
trunk/src/daimonin/src/main/resources/HelpFiles/
trunk/src/daimonin/src/main/resources/icons/
trunk/src/daimonin/src/main/resources/system/
trunk/src/gridarta/src/main/resources/icons/
trunk/src/gridarta/src/main/resources/log4j.properties
trunk/src/gridarta/src/main/resources/misc/
trunk/src/model/src/main/resources/system/
trunk/src/model/src/main/resources/system/dtd/
Removed Paths:
-------------
trunk/src/atrinik/resource/
trunk/src/crossfire/resource/
trunk/src/daimonin/resource/
trunk/src/gridarta/resource/
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/build.xml 2013-05-28 21:57:28 UTC (rev 9239)
@@ -60,77 +60,92 @@
<path id="path.class.atrinik.app">
<pathelement location="${build.dir}/atrinik/app"/>
- <pathelement location="src/atrinik/resource"/>
+ <pathelement location="src/atrinik/src/main/resources"/>
</path>
<path id="path.class.atrinik.test">
<path refid="path.class.atrinik.app"/>
<pathelement location="${build.dir}/atrinik/test"/>
+ <pathelement location="src/atrinik/src/test/resources"/>
</path>
<path id="path.class.crossfire.app">
<pathelement location="${build.dir}/crossfire/app"/>
- <pathelement location="src/crossfire/resource"/>
+ <pathelement location="src/crossfire/src/main/resources"/>
</path>
<path id="path.class.crossfire.test">
<path refid="path.class.crossfire.app"/>
<pathelement location="${build.dir}/crossfire/test"/>
+ <pathelement location="src/crossfire/src/test/resources"/>
</path>
<path id="path.class.daimonin.app">
<pathelement location="${build.dir}/daimonin/app"/>
- <pathelement location="src/daimonin/resource"/>
+ <pathelement location="src/daimonin/src/main/resources"/>
</path>
<path id="path.class.daimonin.test">
<path refid="path.class.daimonin.app"/>
<pathelement location="${build.dir}/daimonin/test"/>
+ <pathelement location="src/daimonin/src/test/resources"/>
</path>
<path id="path.class.gridarta.app">
<pathelement location="${build.dir}/gridarta/app"/>
+ <pathelement location="src/gridarta/src/main/resources"/>
</path>
<path id="path.class.gridarta.test">
<path refid="path.class.gridarta.app"/>
<pathelement location="${build.dir}/gridarta/test"/>
+ <pathelement location="src/gridarta/src/test/resources"/>
</path>
<path id="path.class.model.app">
<pathelement location="${build.dir}/model/app"/>
+ <pathelement location="src/model/src/main/resources"/>
</path>
<path id="path.class.model.test">
<path refid="path.class.model.app"/>
<pathelement location="${build.dir}/model/test"/>
+ <pathelement location="src/model/src/test/resources"/>
</path>
<path id="path.class.preferences.app">
<pathelement location="${build.dir}/preferences/app"/>
+ <pathelement location="src/preferences/src/main/resources"/>
</path>
<path id="path.class.preferences.test">
<path refid="path.class.preferences.app"/>
<pathelement location="${build.dir}/preferences/test"/>
+ <pathelement location="src/preferences/src/test/resources"/>
</path>
<path id="path.class.plugin.app">
<pathelement location="${build.dir}/plugin/app"/>
+ <pathelement location="src/plugin/src/main/resources"/>
</path>
<path id="path.class.plugin.test">
<path refid="path.class.plugin.app"/>
<pathelement location="${build.dir}/plugin/test"/>
+ <pathelement location="src/plugin/src/test/resources"/>
</path>
<path id="path.class.textedit.app">
<pathelement location="${build.dir}/textedit/app"/>
+ <pathelement location="src/textedit/src/main/resources"/>
</path>
<path id="path.class.textedit.test">
<path refid="path.class.textedit.app"/>
<pathelement location="${build.dir}/textedit/test"/>
+ <pathelement location="src/textedit/src/test/resources"/>
</path>
<path id="path.class.utils.app">
<pathelement location="${build.dir}/utils/app"/>
+ <pathelement location="src/utils/src/main/resources"/>
</path>
<path id="path.class.utils.test">
<path refid="path.class.utils.app"/>
<pathelement location="${build.dir}/utils/test"/>
+ <pathelement location="src/utils/src/test/resources"/>
</path>
<path id="path.lib.annotations" location="lib/annotations.jar"/>
@@ -211,8 +226,13 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="src/gridarta/resource"/>
- <fileset dir="src/atrinik/resource"/>
+ <fileset dir="src/atrinik/src/main/resources"/>
+ <fileset dir="src/gridarta/src/main/resources"/>
+ <fileset dir="src/model/src/main/resources"/>
+ <fileset dir="src/preferences/src/main/resources"/>
+ <fileset dir="src/plugin/src/main/resources"/>
+ <fileset dir="src/textedit/src/main/resources"/>
+ <fileset dir="src/utils/src/main/resources"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -251,8 +271,13 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="src/gridarta/resource"/>
- <fileset dir="src/crossfire/resource"/>
+ <fileset dir="src/crossfire/src/main/resources"/>
+ <fileset dir="src/gridarta/src/main/resources"/>
+ <fileset dir="src/model/src/main/resources"/>
+ <fileset dir="src/preferences/src/main/resources"/>
+ <fileset dir="src/plugin/src/main/resources"/>
+ <fileset dir="src/textedit/src/main/resources"/>
+ <fileset dir="src/utils/src/main/resources"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -291,8 +316,13 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="src/gridarta/resource"/>
- <fileset dir="src/daimonin/resource"/>
+ <fileset dir="src/daimonin/src/main/resources"/>
+ <fileset dir="src/gridarta/src/main/resources"/>
+ <fileset dir="src/model/src/main/resources"/>
+ <fileset dir="src/preferences/src/main/resources"/>
+ <fileset dir="src/plugin/src/main/resources"/>
+ <fileset dir="src/textedit/src/main/resources"/>
+ <fileset dir="src/utils/src/main/resources"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -342,7 +372,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/atrinik/app">
- <fileset dir="src/atrinik/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/atrinik/src/main/resources"/>
</copy>
<mkdir dir="${build.dir}/atrinik/test"/>
<javac srcdir="src/atrinik/src/test/java" destdir="${build.dir}/atrinik/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
@@ -379,7 +409,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/crossfire/app">
- <fileset dir="src/crossfire/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/crossfire/src/main/resources"/>
</copy>
<mkdir dir="${build.dir}/crossfire/test"/>
<javac srcdir="src/crossfire/src/test/java" destdir="${build.dir}/crossfire/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
@@ -430,7 +460,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/daimonin/app">
- <fileset dir="src/daimonin/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/daimonin/src/main/resources"/>
</copy>
</target>
@@ -477,7 +507,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/gridarta/app">
- <fileset dir="src/gridarta/src/main/resources" includes="**/*.properties,cfpython_menu.def"/>
+ <fileset dir="src/gridarta/src/main/resources"/>
</copy>
</target>
@@ -514,7 +544,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/model/app">
- <fileset dir="src/model/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/model/src/main/resources"/>
</copy>
</target>
@@ -539,7 +569,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/preferences/app">
- <fileset dir="src/preferences/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/preferences/src/main/resources"/>
</copy>
</target>
@@ -568,7 +598,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/plugin/app">
- <fileset dir="src/plugin/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/plugin/src/main/resources"/>
</copy>
</target>
@@ -595,7 +625,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/textedit/app">
- <fileset dir="src/textedit/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/textedit/src/main/resources"/>
</copy>
</target>
@@ -627,7 +657,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/utils/app">
- <fileset dir="src/utils/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/utils/src/main/resources"/>
</copy>
</target>
@@ -1073,7 +1103,6 @@
<path refid="path.lib.japi-swing-action"/>
<path refid="path.lib.junit"/>
<path refid="path.lib.log4j"/>
- <pathelement location="src/gridarta/resource"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -1097,7 +1126,6 @@
<path refid="path.lib.japi-xml"/>
<path refid="path.lib.junit"/>
<path refid="path.lib.log4j"/>
- <pathelement location="src/gridarta/resource"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/gridarta.ipr 2013-05-28 21:57:28 UTC (rev 9239)
@@ -1328,7 +1328,11 @@
<option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
<option name="myNullables">
<value>
- <list size="0" />
+ <list size="3">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+ </list>
</value>
</option>
<option name="myNotNulls">
Modified: trunk/src/atrinik/atrinik.iml
===================================================================
--- trunk/src/atrinik/atrinik.iml 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/src/atrinik/atrinik.iml 2013-05-28 21:57:28 UTC (rev 9239)
@@ -3,12 +3,10 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/resource" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/class" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: trunk/src/atrinik/src/main/resources/HelpFiles/tut_DScript.html
===================================================================
--- trunk/src/atrinik/resource/resource/HelpFiles/tut_DScript.html 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/src/atrinik/src/main/resources/HelpFiles/tut_DScript.html 2013-05-28 21:57:28 UTC (rev 9239)
@@ -34,15 +34,15 @@
<H1 align=center><font size="+1">There are three different types or groups of
Daimonin Scripting Commands. They are:</font></H1>
-<H1 align=center><font color="#000000" size="+2"><strong><a href="#DFunc">Daimonin
- Functions</a>, <a href="#MMeth">Map Methods</a> & <a href="#OMeth">Object
+<H1 align=center><font color="#000000" size="+2"><strong><a href="tut_DScript.html#DFunc">Daimonin
+ Functions</a>, <a href="tut_DScript.html#MMeth">Map Methods</a> & <a href="tut_DScript.html#OMeth">Object
Methods</a></strong></font></H1>
<H1 align=center><font color="#000000" size="+1">Click on one of the above
topics to be taken to that subject.</font></H1>
<P><strong><font size="+2">Daimonin Functions:<a name="DFunc"></a>
-</font></strong><a href="#DSC">back to the top</a></P>
+</font></strong><a href="tut_DScript.html#DSC">back to the top</a></P>
<P>LoadObject
<br>
@@ -346,7 +346,7 @@
<p> </p>
<p><strong><font size="+2">Map Methods<a name="MMeth"></a>
-</font></strong><a href="#DSC">back to the top</a></p>
+</font></strong><a href="tut_DScript.html#DSC">back to the top</a></p>
<p>GetFirstObjectOnSquare
<br>
@@ -476,7 +476,7 @@
<p></p>
<p><font size="+2"><strong>Object Methods<a name="OMeth"></a>
-</strong></font><a href="#DSC">back to the top</a></p>
+</strong></font><a href="tut_DScript.html#DSC">back to the top</a></p>
<p>GetSkill
<br>
Modified: trunk/src/crossfire/crossfire.iml
===================================================================
--- trunk/src/crossfire/crossfire.iml 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/src/crossfire/crossfire.iml 2013-05-28 21:57:28 UTC (rev 9239)
@@ -3,13 +3,10 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/resource" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/class" />
- <excludeFolder url="file://$MODULE_DIR$/classes" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Copied: trunk/src/crossfire/src/main/resources/gridarta-crossfire.png (from rev 9238, trunk/src/crossfire/resource/gridarta-crossfire.png)
===================================================================
(Binary files differ)
Index: trunk/src/crossfire/src/main/resources/gridarta-crossfire.png
===================================================================
--- trunk/src/crossfire/resource/gridarta-crossfire.png 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/src/crossfire/src/main/resources/gridarta-crossfire.png 2013-05-28 21:57:28 UTC (rev 9239)
Property changes on: trunk/src/crossfire/src/main/resources/gridarta-crossfire.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: trunk/src/crossfire/src/main/resources/resource/HelpFiles/tut_map.html
===================================================================
--- trunk/src/crossfire/resource/resource/HelpFiles/tut_map.html 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/src/crossfire/src/main/resources/resource/HelpFiles/tut_map.html 2013-05-28 21:57:28 UTC (rev 9239)
@@ -33,9 +33,9 @@
the following actions with your mouse:</p>
<ul>
- <li>left mouse button: <a href="#select">select game object(s)</a>
- <li>right mouse button: <a href="#insert">insert an game object</a>
- <li>middle mouse button: <a href="#delete">delete an game object</a>
+ <li>left mouse button: <a href="tut_map.html#select">select game object(s)</a>
+ <li>right mouse button: <a href="tut_map.html#insert">insert an game object</a>
+ <li>middle mouse button: <a href="tut_map.html#delete">delete an game object</a>
</ul>
<h2><a name="select">Selecting game object</a></h2>
Modified: trunk/src/crossfire/src/main/resources/resource/HelpFiles/tut_mapattr.html
===================================================================
--- trunk/src/crossfire/resource/resource/HelpFiles/tut_mapattr.html 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/src/crossfire/src/main/resources/resource/HelpFiles/tut_mapattr.html 2013-05-28 21:57:28 UTC (rev 9239)
@@ -59,7 +59,7 @@
<p><b>Fixed reset:</b> If enabled, the map reset countdown will not start over
when someone enters the map. Thus, once the map has been loaded, it will
- reset in after <a href="#parameters">"Reset Timeout"</a> seconds, no matter
+ reset in after <a href="tut_mapattr.html#parameters">"Reset Timeout"</a> seconds, no matter
what access happens. This is very useful for shops and towns which are
constantly accessed, but should be reset periodically.</p>
Modified: trunk/src/daimonin/daimonin.iml
===================================================================
--- trunk/src/daimonin/daimonin.iml 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/src/daimonin/daimonin.iml 2013-05-28 21:57:28 UTC (rev 9239)
@@ -3,12 +3,10 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/resource" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/class" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: trunk/src/daimonin/src/main/resources/HelpFiles/tut_DScript.html
===================================================================
--- trunk/src/daimonin/resource/resource/HelpFiles/tut_DScript.html 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/src/daimonin/src/main/resources/HelpFiles/tut_DScript.html 2013-05-28 21:57:28 UTC (rev 9239)
@@ -34,15 +34,15 @@
<H1 align=center><font size="+1">There are three different types or groups of
Daimonin Scripting Commands. They are:</font></H1>
-<H1 align=center><font color="#000000" size="+2"><strong><a href="#DFunc">Daimonin
- Functions</a>, <a href="#MMeth">Map Methods</a> & <a href="#OMeth">Object
+<H1 align=center><font color="#000000" size="+2"><strong><a href="tut_DScript.html#DFunc">Daimonin
+ Functions</a>, <a href="tut_DScript.html#MMeth">Map Methods</a> & <a href="tut_DScript.html#OMeth">Object
Methods</a></strong></font></H1>
<H1 align=center><font color="#000000" size="+1">Click on one of the above
topics to be taken to that subject.</font></H1>
<P><strong><font size="+2">Daimonin Functions:<a name="DFunc"></a>
-</font></strong><a href="#DSC">back to the top</a></P>
+</font></strong><a href="tut_DScript.html#DSC">back to the top</a></P>
<P>LoadObject
<br>
@@ -346,7 +346,7 @@
<p> </p>
<p><strong><font size="+2">Map Methods<a name="MMeth"></a>
-</font></strong><a href="#DSC">back to the top</a></p>
+</font></strong><a href="tut_DScript.html#DSC">back to the top</a></p>
<p>GetFirstObjectOnSquare
<br>
@@ -476,7 +476,7 @@
<p></p>
<p><font size="+2"><strong>Object Methods<a name="OMeth"></a>
-</strong></font><a href="#DSC">back to the top</a></p>
+</strong></font><a href="tut_DScript.html#DSC">back to the top</a></p>
<p>GetSkill
<br>
Modified: trunk/src/gridarta/gridarta.iml
===================================================================
--- trunk/src/gridarta/gridarta.iml 2013-05-28 20:09:22 UTC (rev 9238)
+++ trunk/src/gridarta/gridarta.iml 2013-05-28 21:57:28 UTC (rev 9239)
@@ -2,7 +2,6 @@
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/resource" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
Copied: trunk/src/gridarta/src/main/resources/log4j.properties (from rev 9238, trunk/src/gridarta/resource/log4j.properties)
===================================================================
--- trunk/src/gridarta/src/main/resources/log4j.properties (rev 0)
+++ trunk/src/gridarta/src/main/resources/log4j.properties 2013-05-28 21:57:28 UTC (rev 9239)
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+# Set root logger level to INFO and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p(%t) %-30c %x - %m%n
+
+log4j.logger.net.sf.gridarta.model.index.MapsIndexer=WARN
Property changes on: trunk/src/gridarta/src/main/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:mergeinfo
## -0,0 +1 ##
+/streams/cher-japi-update/crossfire/resource/log4j.properties:5966-5991
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-28 20:09:26
|
Revision: 9238
http://sourceforge.net/p/gridarta/code/9238
Author: akirschbaum
Date: 2013-05-28 20:09:22 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Move java sources into common src directory.
Modified Paths:
--------------
trunk/build.xml
trunk/gridarta.ipr
Added Paths:
-----------
trunk/src/
trunk/src/atrinik/
trunk/src/crossfire/
trunk/src/daimonin/
trunk/src/gridarta/
trunk/src/model/
trunk/src/plugin/
trunk/src/preferences/
trunk/src/textedit/
trunk/src/utils/
Removed Paths:
-------------
trunk/atrinik/
trunk/crossfire/
trunk/daimonin/
trunk/gridarta/
trunk/model/
trunk/plugin/
trunk/preferences/
trunk/textedit/
trunk/utils/
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-05-28 20:00:26 UTC (rev 9237)
+++ trunk/build.xml 2013-05-28 20:09:22 UTC (rev 9238)
@@ -17,7 +17,7 @@
~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-->
-<!DOCTYPE project [<!ENTITY catalogForAnt SYSTEM "gridarta/src/doc/dtd/catalogForAnt.xml">]>
+<!DOCTYPE project [<!ENTITY catalogForAnt SYSTEM "src/gridarta/src/doc/dtd/catalogForAnt.xml">]>
<project default="jar">
<description>
@@ -60,7 +60,7 @@
<path id="path.class.atrinik.app">
<pathelement location="${build.dir}/atrinik/app"/>
- <pathelement location="atrinik/resource"/>
+ <pathelement location="src/atrinik/resource"/>
</path>
<path id="path.class.atrinik.test">
<path refid="path.class.atrinik.app"/>
@@ -69,7 +69,7 @@
<path id="path.class.crossfire.app">
<pathelement location="${build.dir}/crossfire/app"/>
- <pathelement location="crossfire/resource"/>
+ <pathelement location="src/crossfire/resource"/>
</path>
<path id="path.class.crossfire.test">
<path refid="path.class.crossfire.app"/>
@@ -78,7 +78,7 @@
<path id="path.class.daimonin.app">
<pathelement location="${build.dir}/daimonin/app"/>
- <pathelement location="daimonin/resource"/>
+ <pathelement location="src/daimonin/resource"/>
</path>
<path id="path.class.daimonin.test">
<path refid="path.class.daimonin.app"/>
@@ -179,8 +179,8 @@
<target name="clean" description="Removes all generated files.">
<delete dir="${build.dir}"/>
<delete dir="${dist.dir}"/>
- <delete file="gridarta/src/doc/dev/SafeCopy.java.xhtml"/>
- <delete file="gridarta/src/doc/dev/changelog.xml"/>
+ <delete file="src/gridarta/src/doc/dev/SafeCopy.java.xhtml"/>
+ <delete file="src/gridarta/src/doc/dev/changelog.xml"/>
<delete dir="${docs.dir}"/>
<delete file="AtrinikEditor.jar"/>
<delete file="CrossfireEditor.jar"/>
@@ -200,7 +200,7 @@
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
- <fileset dir="atrinik/lib">
+ <fileset dir="src/atrinik/lib">
<include name="*-LICENSE"/>
</fileset>
<fileset dir="lib">
@@ -211,8 +211,8 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="gridarta/resource"/>
- <fileset dir="atrinik/resource"/>
+ <fileset dir="src/gridarta/resource"/>
+ <fileset dir="src/atrinik/resource"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -240,7 +240,7 @@
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
- <fileset dir="crossfire/lib">
+ <fileset dir="src/crossfire/lib">
<include name="*-LICENSE"/>
</fileset>
<fileset dir="lib">
@@ -251,8 +251,8 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="gridarta/resource"/>
- <fileset dir="crossfire/resource"/>
+ <fileset dir="src/gridarta/resource"/>
+ <fileset dir="src/crossfire/resource"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -280,7 +280,7 @@
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
- <fileset dir="daimonin/lib">
+ <fileset dir="src/daimonin/lib">
<include name="*-LICENSE"/>
</fileset>
<fileset dir="lib">
@@ -291,8 +291,8 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="gridarta/resource"/>
- <fileset dir="daimonin/resource"/>
+ <fileset dir="src/gridarta/resource"/>
+ <fileset dir="src/daimonin/resource"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -327,7 +327,7 @@
<target name="compile-atrinik" description="Compiles the atrinik module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-utils">
<mkdir dir="${build.dir}/atrinik/app"/>
- <javac srcdir="atrinik/src/main/java" destdir="${build.dir}/atrinik/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/atrinik/src/main/java" destdir="${build.dir}/atrinik/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
@@ -342,10 +342,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/atrinik/app">
- <fileset dir="atrinik/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/atrinik/src/main/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/atrinik/test"/>
- <javac srcdir="atrinik/src/test/java" destdir="${build.dir}/atrinik/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/atrinik/src/test/java" destdir="${build.dir}/atrinik/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.atrinik.app"/>
<path refid="path.class.gridarta.test"/>
@@ -358,13 +358,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/atrinik/test">
- <fileset dir="atrinik/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/atrinik/src/test/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-crossfire" description="Compiles the crossfire module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-utils">
<mkdir dir="${build.dir}/crossfire/app"/>
- <javac srcdir="crossfire/src/main/java" destdir="${build.dir}/crossfire/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/crossfire/src/main/java" destdir="${build.dir}/crossfire/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
@@ -379,10 +379,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/crossfire/app">
- <fileset dir="crossfire/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/crossfire/src/main/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/crossfire/test"/>
- <javac srcdir="crossfire/src/test/java" destdir="${build.dir}/crossfire/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/crossfire/src/test/java" destdir="${build.dir}/crossfire/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.crossfire.app"/>
<path refid="path.class.gridarta.test"/>
@@ -395,13 +395,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/crossfire/test">
- <fileset dir="crossfire/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/crossfire/src/test/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-daimonin" description="Compiles the daimonin module." depends="compile-gridarta,compile-model,compile-plugin,compile-utils">
<mkdir dir="${build.dir}/daimonin/app"/>
- <javac srcdir="daimonin/src/main/java" destdir="${build.dir}/daimonin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/daimonin/src/main/java" destdir="${build.dir}/daimonin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
@@ -416,10 +416,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/daimonin/test">
- <fileset dir="daimonin/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/daimonin/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/daimonin/test"/>
- <javac srcdir="daimonin/src/test/java" destdir="${build.dir}/daimonin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/daimonin/src/test/java" destdir="${build.dir}/daimonin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.daimonin.app"/>
<path refid="path.class.gridarta.test"/>
@@ -430,13 +430,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/daimonin/app">
- <fileset dir="daimonin/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/daimonin/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-gridarta" description="Compiles the gridarta module." depends="compile-model,compile-preferences,compile-plugin,compile-textedit,compile-utils">
<mkdir dir="${build.dir}/gridarta/app"/>
- <javac srcdir="gridarta/src/main/java" destdir="${build.dir}/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/gridarta/src/main/java" destdir="${build.dir}/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.preferences.app"/>
@@ -460,10 +460,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/gridarta/test">
- <fileset dir="gridarta/src/test/resources" includes="**/*.properties,cfpython_menu.def"/>
+ <fileset dir="src/gridarta/src/test/resources" includes="**/*.properties,cfpython_menu.def"/>
</copy>
<mkdir dir="${build.dir}/gridarta/test"/>
- <javac srcdir="gridarta/src/test/java" destdir="${build.dir}/gridarta/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/gridarta/src/test/java" destdir="${build.dir}/gridarta/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.test"/>
@@ -477,13 +477,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/gridarta/app">
- <fileset dir="gridarta/src/main/resources" includes="**/*.properties,cfpython_menu.def"/>
+ <fileset dir="src/gridarta/src/main/resources" includes="**/*.properties,cfpython_menu.def"/>
</copy>
</target>
<target name="compile-model" description="Compiles the model module." depends="compile-utils">
<mkdir dir="${build.dir}/model/app"/>
- <javac srcdir="model/src/main/java" destdir="${build.dir}/model/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/model/src/main/java" destdir="${build.dir}/model/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
@@ -497,10 +497,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/model/test">
- <fileset dir="model/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/model/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/model/test"/>
- <javac srcdir="model/src/test/java" destdir="${build.dir}/model/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/model/src/test/java" destdir="${build.dir}/model/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.utils.test"/>
@@ -514,13 +514,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/model/app">
- <fileset dir="model/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/model/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-preferences" description="Compiles the preferences module.">
<mkdir dir="${build.dir}/preferences/app"/>
- <javac srcdir="preferences/src/main/java" destdir="${build.dir}/preferences/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/preferences/src/main/java" destdir="${build.dir}/preferences/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -529,23 +529,23 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/preferences/test">
- <fileset dir="preferences/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/preferences/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/preferences/test"/>
- <javac srcdir="preferences/src/test/java" destdir="${build.dir}/preferences/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/preferences/src/test/java" destdir="${build.dir}/preferences/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.preferences.app"/>
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/preferences/app">
- <fileset dir="preferences/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/preferences/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-plugin" description="Compiles the plugin module." depends="compile-model,compile-utils">
<mkdir dir="${build.dir}/plugin/app"/>
- <javac srcdir="plugin/src/main/java" destdir="${build.dir}/plugin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/plugin/src/main/java" destdir="${build.dir}/plugin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.utils.app"/>
@@ -558,23 +558,23 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/plugin/test">
- <fileset dir="plugin/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/plugin/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/plugin/test"/>
- <javac srcdir="plugin/src/test/java" destdir="${build.dir}/plugin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/plugin/src/test/java" destdir="${build.dir}/plugin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.plugin.app"/>
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/plugin/app">
- <fileset dir="plugin/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/plugin/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-textedit" description="Compiles the textedit module." depends="compile-utils">
<mkdir dir="${build.dir}/textedit/app"/>
- <javac srcdir="textedit/src/main/java" destdir="${build.dir}/textedit/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/textedit/src/main/java" destdir="${build.dir}/textedit/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
@@ -584,10 +584,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/textedit/test">
- <fileset dir="textedit/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/textedit/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/textedit/test"/>
- <javac srcdir="textedit/src/test/java" destdir="${build.dir}/textedit/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/textedit/src/test/java" destdir="${build.dir}/textedit/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.textedit.app"/>
<path refid="path.class.utils.test"/>
@@ -595,13 +595,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/textedit/app">
- <fileset dir="textedit/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/textedit/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-utils" description="Compiles the utils module.">
<mkdir dir="${build.dir}/utils/app"/>
- <javac srcdir="utils/src/main/java" destdir="${build.dir}/utils/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/utils/src/main/java" destdir="${build.dir}/utils/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -612,10 +612,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/utils/test">
- <fileset dir="utils/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/utils/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/utils/test"/>
- <javac srcdir="utils/src/test/java" destdir="${build.dir}/utils/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/utils/src/test/java" destdir="${build.dir}/utils/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
@@ -627,7 +627,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/utils/app">
- <fileset dir="utils/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/utils/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
@@ -635,27 +635,27 @@
<target name="java2html" description="Converts documentation java sources to XHTML.">
<taskdef name="java2html" classpath="lib/java2html.jar" classname="de.java2html.anttasks.Java2HtmlTask"/>
- <java2html srcdir="gridarta/src/doc" destdir="gridarta/src/doc" includes="**/*.java" outputformat="xhtml11" tabs="4" style="eclipse" addlineanchors="true" includedocumentfooter="true" includedocumentheader="true" lineanchorprefix="line" showdefaulttitle="true" showfilename="true" showlinenumbers="true" showtableborder="true"/>
+ <java2html srcdir="src/gridarta/src/doc" destdir="src/gridarta/src/doc" includes="**/*.java" outputformat="xhtml11" tabs="4" style="eclipse" addlineanchors="true" includedocumentfooter="true" includedocumentheader="true" lineanchorprefix="line" showdefaulttitle="true" showfilename="true" showlinenumbers="true" showtableborder="true"/>
</target>
<target name="editorialDoc" description="Creates the editorial part of the project documentation." depends="java2html">
<mkdir dir="${build.dir}/doc"/>
- <megaxslt srcdir="gridarta/src/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="true" ending="xhtml" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
+ <megaxslt srcdir="src/gridarta/src/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="true" ending="xhtml" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="gridarta/src/doc/transform.xslt"/>
- <transformation stylesheet="gridarta/src/doc/cleanupXhtml11.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/transform.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/cleanupXhtml11.xslt"/>
</megaxslt>
<megaxslt srcdir="${build.dir}/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="false" ending="html" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="gridarta/src/doc/xhtml2html.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/xhtml2html.xslt"/>
</megaxslt>
- <megaxslt srcdir="gridarta/src/doc" destdir="." includes="faq.xhtml" validatesource="true" validatedest="false" ending="" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
+ <megaxslt srcdir="src/gridarta/src/doc" destdir="." includes="faq.xhtml" validatesource="true" validatedest="false" ending="" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="gridarta/src/doc/faq2txt.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/faq2txt.xslt"/>
</megaxslt>
<copy file="faq" tofile="FAQ"/>
<copy todir="${build.dir}/doc">
- <fileset dir="gridarta/src/doc">
+ <fileset dir="src/gridarta/src/doc">
<include name="**/.htaccess"/>
<include name="**/*.html"/>
<include name="dtd/**/*.mod"/>
@@ -672,13 +672,13 @@
<target name="apiDoc" description="Creates public javadoc documentation.">
<mkdir dir="${build.dir}/doc/api/${project.version}"/>
- <copy todir="${build.dir}/doc/api/${project.version}" file="gridarta/src/doc/copyright.xhtml"/>
- <copy todir="${build.dir}/doc/api/${project.version}" file="gridarta/src/doc/dev/api/.htaccess"/>
- <javadoc destdir="${build.dir}/doc/api/${project.version}" access="protected" author="yes" version="yes" locale="en_US" use="yes" splitindex="yes" windowtitle="Gridarta API documentation" doctitle="Gridarta<br />Yet another Java API<br />API Documentation" header="Gridarta ${project.version}<br />Yet another Java API<br />API Documentation" footer="Gridarta<br />Yet another Java API<br />API Documentation" bottom="<div style="text-align:center;">© 2005-2006 The Gridarta Developers. All rights reserved. See <a href="{@docRoot}/copyright.xhtml">copyright</a></div>" serialwarn="yes" charset="${build.source.encoding}" docencoding="${build.source.encoding}" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" overview="gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
+ <copy todir="${build.dir}/doc/api/${project.version}" file="src/gridarta/src/doc/copyright.xhtml"/>
+ <copy todir="${build.dir}/doc/api/${project.version}" file="src/gridarta/src/doc/dev/api/.htaccess"/>
+ <javadoc destdir="${build.dir}/doc/api/${project.version}" access="protected" author="yes" version="yes" locale="en_US" use="yes" splitindex="yes" windowtitle="Gridarta API documentation" doctitle="Gridarta<br />Yet another Java API<br />API Documentation" header="Gridarta ${project.version}<br />Yet another Java API<br />API Documentation" footer="Gridarta<br />Yet another Java API<br />API Documentation" bottom="<div style="text-align:center;">© 2005-2006 The Gridarta Developers. All rights reserved. See <a href="{@docRoot}/copyright.xhtml">copyright</a></div>" serialwarn="yes" charset="${build.source.encoding}" docencoding="${build.source.encoding}" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" overview="src/gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
<classpath>
- <fileset dir="atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="lib" includes="*.jar" excludes="*.jar-LICENSE"/>
</classpath>
<sourcepath>
@@ -693,24 +693,24 @@
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
- <packageset dir="gridarta/src/main/java" defaultexcludes="yes"/>
- <packageset dir="gridarta/src/test/java" defaultexcludes="yes"/>
- <packageset dir="atrinik/src/main/java" defaultexcludes="yes"/>
- <packageset dir="atrinik/src/test/java" defaultexcludes="yes"/>
- <packageset dir="crossfire/src/main/java" defaultexcludes="yes"/>
- <packageset dir="crossfire/src/test/java" defaultexcludes="yes"/>
- <packageset dir="daimonin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="daimonin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="model/src/main/java" defaultexcludes="yes"/>
- <packageset dir="model/src/test/java" defaultexcludes="yes"/>
- <packageset dir="preferences/src/main/java" defaultexcludes="yes"/>
- <packageset dir="preferences/src/test/java" defaultexcludes="yes"/>
- <packageset dir="plugin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="plugin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="textedit/src/main/java" defaultexcludes="yes"/>
- <packageset dir="textedit/src/test/java" defaultexcludes="yes"/>
- <packageset dir="utils/src/main/java" defaultexcludes="yes"/>
- <packageset dir="utils/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/gridarta/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/gridarta/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/atrinik/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/atrinik/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/crossfire/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/crossfire/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/daimonin/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/daimonin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/model/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/model/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/preferences/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/preferences/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/plugin/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/plugin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/textedit/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/textedit/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/utils/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/utils/src/test/java" defaultexcludes="yes"/>
<tag name="todo" description="Todo:"/>
<tag name="used" description="Manually marked as used." enabled="false"/>
<tag name="fixme" description="Fixme:"/>
@@ -734,19 +734,19 @@
<parallel>
<tar tarfile="${distSrc}.tar">
<tarfileset dir="." prefix="gridarta-${project.version}">
- <include name="gridarta/src/**"/>
+ <include name="src/gridarta/src/**"/>
<include name="build.xml"/>
</tarfileset>
</tar>
<zip destfile="${distSrc}.zip">
<zipfileset dir="." prefix="gridarta-${project.version}">
- <include name="gridarta/src/**"/>
+ <include name="src/gridarta/src/**"/>
<include name="build.xml"/>
</zipfileset>
</zip>
<jar destfile="${distSrc}.jar">
<zipfileset dir="." prefix="gridarta-${project.version}">
- <include name="gridarta/src/**"/>
+ <include name="src/gridarta/src/**"/>
<include name="build.xml"/>
</zipfileset>
</jar>
@@ -809,14 +809,14 @@
</target>
<target name="releaseDist" description="Uploads distribution archives to sourceforge." if="developer.email" depends="checkDevMail, dist">
- <touch file="gridarta/src/doc/api/start.xhtml" millis="0"/>
- <megaxslt srcdir="gridarta/src/doc/api" destdir="gridarta/src/doc/api" includes="start.xhtml" validatesource="true" validatedest="true" ending="xhtml" converttocanonical="true" checktimestamps="true">
+ <touch file="src/gridarta/src/doc/api/start.xhtml" millis="0"/>
+ <megaxslt srcdir="src/gridarta/src/doc/api" destdir="src/gridarta/src/doc/api" includes="start.xhtml" validatesource="true" validatedest="true" ending="xhtml" converttocanonical="true" checktimestamps="true">
<xmlcatalog refid="commonDTDs"/>
<parameter name="project.version" value="${project.version}"/>
- <transformation stylesheet="gridarta/src/doc/api/release.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/api/release.xslt"/>
</megaxslt>
<svn javahl="${user.svn.javahl}">
- <commit file="gridarta/src/doc/api/start.xhtml" message="Updating API link to include ${project.version}."/>
+ <commit file="src/gridarta/src/doc/api/start.xhtml" message="Updating API link to include ${project.version}."/>
</svn>
<exec executable="rsync" failonerror="true">
<arg line="-auzv -e ssh ${build.dir}/doc/api/ ${user.rsync.username}@${user.rsync.host}:${user.rsync.dir}/htdocs/api/"/>
@@ -877,27 +877,27 @@
<target name="checkstyle" description="Runs checkstyle to style-check the source code">
<taskdef resource="checkstyletask.properties" classpath="lib/checkstyle-all-5.0.jar"/>
<mkdir dir="${build.dir}/doc"/>
- <checkstyle config="gridarta/src/checkstyle.xml" failOnViolation="true">
+ <checkstyle config="src/gridarta/src/checkstyle.xml" failOnViolation="true">
<formatter type="plain" tofile="${build.dir}/doc/checkstyle_report.txt"/>
<formatter type="plain"/>
- <fileset dir="gridarta/src/main/java" includes="**/*.java"/>
- <fileset dir="gridarta/src/test/java" includes="**/*.java"/>
- <fileset dir="atrinik/src/main/java" includes="**/*.java"/>
- <fileset dir="atrinik/src/test/java" includes="**/*.java"/>
- <fileset dir="crossfire/src/main/java" includes="**/*.java"/>
- <fileset dir="crossfire/src/test/java" includes="**/*.java"/>
- <fileset dir="daimonin/src/main/java" includes="**/*.java"/>
- <fileset dir="daimonin/src/test/java" includes="**/*.java"/>
- <fileset dir="model/src/main/java" includes="**/*.java"/>
- <fileset dir="model/src/test/java" includes="**/*.java"/>
- <fileset dir="preferences/src/main/java" includes="**/*.java"/>
- <fileset dir="preferences/src/test/java" includes="**/*.java"/>
- <fileset dir="plugin/src/main/java" includes="**/*.java"/>
- <fileset dir="plugin/src/test/java" includes="**/*.java"/>
- <fileset dir="textedit/src/main/java" includes="**/*.java"/>
- <fileset dir="textedit/src/test/java" includes="**/*.java"/>
- <fileset dir="utils/src/main/java" includes="**/*.java"/>
- <fileset dir="utils/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/gridarta/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/gridarta/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/atrinik/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/atrinik/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/crossfire/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/crossfire/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/daimonin/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/daimonin/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/model/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/model/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/preferences/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/preferences/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/plugin/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/plugin/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/textedit/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/textedit/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/utils/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/utils/src/test/java" includes="**/*.java"/>
</checkstyle>
</target>
@@ -906,22 +906,22 @@
</target>
<target name="changelog" description="Updates the changelog">
- <exec executable="svn" output="gridarta/src/doc/dev/changelog.xml">
+ <exec executable="svn" output="src/gridarta/src/doc/dev/changelog.xml">
<arg line="log -v --xml"/>
</exec>
- <megaxslt srcdir="gridarta/src/doc/dev" destdir="gridarta/src/doc/dev" includes="changelog.xml" validatesource="false" validatedest="false" ending="xhtml" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
+ <megaxslt srcdir="src/gridarta/src/doc/dev" destdir="src/gridarta/src/doc/dev" includes="changelog.xml" validatesource="false" validatedest="false" ending="xhtml" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="gridarta/src/doc/dev/changelog.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/dev/changelog.xslt"/>
</megaxslt>
</target>
<target name="javadoc" depends="init-properties" description="Creates the JavaDoc documentation for the complete editor source.">
<mkdir dir="${build.dir}/doc/dev/api"/>
- <javadoc destdir="${build.dir}/doc/dev/api" locale="en_US" version="yes" author="yes" use="yes" splitindex="yes" windowtitle="Gridarta — API Documentation" doctitle="Gridarta ${build.number}<br />API Documentation" header="Gridarta ${build.number}<br />API Documentation" footer="Gridarta ${build.number}<br />API Documentation" serialwarn="no" charset="utf-8" docencoding="utf-8" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" private="yes" overview="gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
+ <javadoc destdir="${build.dir}/doc/dev/api" locale="en_US" version="yes" author="yes" use="yes" splitindex="yes" windowtitle="Gridarta — API Documentation" doctitle="Gridarta ${build.number}<br />API Documentation" header="Gridarta ${build.number}<br />API Documentation" footer="Gridarta ${build.number}<br />API Documentation" serialwarn="no" charset="utf-8" docencoding="utf-8" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" private="yes" overview="src/gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
<classpath>
- <fileset dir="atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="lib" includes="*.jar" excludes="*.jar-LICENSE"/>
</classpath>
<sourcepath>
@@ -936,24 +936,24 @@
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
- <packageset dir="gridarta/src/main/java" defaultexcludes="yes"/>
- <packageset dir="gridarta/src/test/java" defaultexcludes="yes"/>
- <packageset dir="atrinik/src/main/java" defaultexcludes="yes"/>
- <packageset dir="atrinik/src/test/java" defaultexcludes="yes"/>
- <packageset dir="crossfire/src/main/java" defaultexcludes="yes"/>
- <packageset dir="crossfire/src/test/java" defaultexcludes="yes"/>
- <packageset dir="daimonin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="daimonin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="model/src/main/java" defaultexcludes="yes"/>
- <packageset dir="model/src/test/java" defaultexcludes="yes"/>
- <packageset dir="preferences/src/main/java" defaultexcludes="yes"/>
- <packageset dir="preferences/src/test/java" defaultexcludes="yes"/>
- <packageset dir="plugin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="plugin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="textedit/src/main/java" defaultexcludes="yes"/>
- <packageset dir="textedit/src/test/java" defaultexcludes="yes"/>
- <packageset dir="utils/src/main/java" defaultexcludes="yes"/>
- <packageset dir="utils/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/gridarta/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/gridarta/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/atrinik/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/atrinik/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/crossfire/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/crossfire/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/daimonin/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/daimonin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/model/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/model/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/preferences/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/preferences/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/plugin/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/plugin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/textedit/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/textedit/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/utils/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/utils/src/test/java" defaultexcludes="yes"/>
<bottom>
<![CDATA[<address>
<a href="http://sourceforge.net/"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=166996&type=1" alt="SourceForge.net Logo" width="88" height="31" class="now" /></a>
@@ -1073,7 +1073,7 @@
<path refid="path.lib.japi-swing-action"/>
<path refid="path.lib.junit"/>
<path refid="path.lib.log4j"/>
- <pathelement location="gridarta/resource"/>
+ <pathelement location="src/gridarta/resource"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -1097,7 +1097,7 @@
<path refid="path.lib.japi-xml"/>
<path refid="path.lib.junit"/>
<path refid="path.lib.log4j"/>
- <pathelement location="gridarta/resource"/>
+ <pathelement location="src/gridarta/resource"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-05-28 20:00:26 UTC (rev 9237)
+++ trunk/gridarta.ipr 2013-05-28 20:09:22 UTC (rev 9238)
@@ -2170,15 +2170,15 @@
</component>
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/atrinik/atrinik.iml" filepath="$PROJECT_DIR$/atrinik/atrinik.iml" />
- <module fileurl="file://$PROJECT_DIR$/crossfire/crossfire.iml" filepath="$PROJECT_DIR$/crossfire/crossfire.iml" />
- <module fileurl="file://$PROJECT_DIR$/daimonin/daimonin.iml" filepath="$PROJECT_DIR$/daimonin/daimonin.iml" />
- <module fileurl="file://$PROJECT_DIR$/gridarta/gridarta.iml" filepath="$PROJECT_DIR$/gridarta/gridarta.iml" />
- <module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
- <module fileurl="file://$PROJECT_DIR$/plugin/plugin.iml" filepath="$PROJECT_DIR$/plugin/plugin.iml" />
- <module fileurl="file://$PROJECT_DIR$/preferences/preferences.iml" filepath="$PROJECT_DIR$/preferences/preferences.iml" />
- <module fileurl="file://$PROJECT_DIR$/textedit/textedit.iml" filepath="$PROJECT_DIR$/textedit/textedit.iml" />
- <module fileurl="file://$PROJECT_DIR$/utils/utils.iml" filepath="$PROJECT_DIR$/utils/utils.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/atrinik/atrinik.iml" filepath="$PROJECT_DIR$/src/atrinik/atrinik.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/crossfire/crossfire.iml" filepath="$PROJECT_DIR$/src/crossfire/crossfire.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/daimonin/daimonin.iml" filepath="$PROJECT_DIR$/src/daimonin/daimonin.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/gridarta/gridarta.iml" filepath="$PROJECT_DIR$/src/gridarta/gridarta.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/model/model.iml" filepath="$PROJECT_DIR$/src/model/model.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/plugin/plugin.iml" filepath="$PROJECT_DIR$/src/plugin/plugin.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/preferences/preferences.iml" filepath="$PROJECT_DIR$/src/preferences/preferences.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/textedit/textedit.iml" filepath="$PROJECT_DIR$/src/textedit/textedit.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/utils/utils.iml" filepath="$PROJECT_DIR$/src/utils/utils.iml" />
</modules>
</component>
<component name="ProjectResources">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-28 20:00:33
|
Revision: 9237
http://sourceforge.net/p/gridarta/code/9237
Author: akirschbaum
Date: 2013-05-28 20:00:26 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Move gridarta module into subdirectory.
Modified Paths:
--------------
trunk/build.xml
trunk/gridarta.ipr
Added Paths:
-----------
trunk/gridarta/
trunk/gridarta/gridarta.iml
trunk/gridarta/resource/
trunk/gridarta/src/
Removed Paths:
-------------
trunk/gridarta.iml
trunk/resource/
trunk/src/
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-05-28 19:39:43 UTC (rev 9236)
+++ trunk/build.xml 2013-05-28 20:00:26 UTC (rev 9237)
@@ -17,7 +17,7 @@
~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-->
-<!DOCTYPE project [<!ENTITY catalogForAnt SYSTEM "src/doc/dtd/catalogForAnt.xml">]>
+<!DOCTYPE project [<!ENTITY catalogForAnt SYSTEM "gridarta/src/doc/dtd/catalogForAnt.xml">]>
<project default="jar">
<description>
@@ -179,8 +179,8 @@
<target name="clean" description="Removes all generated files.">
<delete dir="${build.dir}"/>
<delete dir="${dist.dir}"/>
- <delete file="src/doc/dev/SafeCopy.java.xhtml"/>
- <delete file="src/doc/dev/changelog.xml"/>
+ <delete file="gridarta/src/doc/dev/SafeCopy.java.xhtml"/>
+ <delete file="gridarta/src/doc/dev/changelog.xml"/>
<delete dir="${docs.dir}"/>
<delete file="AtrinikEditor.jar"/>
<delete file="CrossfireEditor.jar"/>
@@ -211,7 +211,7 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="resource"/>
+ <fileset dir="gridarta/resource"/>
<fileset dir="atrinik/resource"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
@@ -251,7 +251,7 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="resource"/>
+ <fileset dir="gridarta/resource"/>
<fileset dir="crossfire/resource"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
@@ -291,7 +291,7 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="resource"/>
+ <fileset dir="gridarta/resource"/>
<fileset dir="daimonin/resource"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
@@ -436,7 +436,7 @@
<target name="compile-gridarta" description="Compiles the gridarta module." depends="compile-model,compile-preferences,compile-plugin,compile-textedit,compile-utils">
<mkdir dir="${build.dir}/gridarta/app"/>
- <javac srcdir="src/main/java" destdir="${build.dir}/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="gridarta/src/main/java" destdir="${build.dir}/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.preferences.app"/>
@@ -460,10 +460,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/gridarta/test">
- <fileset dir="src/test/resources" includes="**/*.properties,cfpython_menu.def"/>
+ <fileset dir="gridarta/src/test/resources" includes="**/*.properties,cfpython_menu.def"/>
</copy>
<mkdir dir="${build.dir}/gridarta/test"/>
- <javac srcdir="src/test/java" destdir="${build.dir}/gridarta/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="gridarta/src/test/java" destdir="${build.dir}/gridarta/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.test"/>
@@ -477,7 +477,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/gridarta/app">
- <fileset dir="src/main/resources" includes="**/*.properties,cfpython_menu.def"/>
+ <fileset dir="gridarta/src/main/resources" includes="**/*.properties,cfpython_menu.def"/>
</copy>
</target>
@@ -635,27 +635,27 @@
<target name="java2html" description="Converts documentation java sources to XHTML.">
<taskdef name="java2html" classpath="lib/java2html.jar" classname="de.java2html.anttasks.Java2HtmlTask"/>
- <java2html srcdir="src/doc" destdir="src/doc" includes="**/*.java" outputformat="xhtml11" tabs="4" style="eclipse" addlineanchors="true" includedocumentfooter="true" includedocumentheader="true" lineanchorprefix="line" showdefaulttitle="true" showfilename="true" showlinenumbers="true" showtableborder="true"/>
+ <java2html srcdir="gridarta/src/doc" destdir="gridarta/src/doc" includes="**/*.java" outputformat="xhtml11" tabs="4" style="eclipse" addlineanchors="true" includedocumentfooter="true" includedocumentheader="true" lineanchorprefix="line" showdefaulttitle="true" showfilename="true" showlinenumbers="true" showtableborder="true"/>
</target>
<target name="editorialDoc" description="Creates the editorial part of the project documentation." depends="java2html">
<mkdir dir="${build.dir}/doc"/>
- <megaxslt srcdir="src/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="true" ending="xhtml" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
+ <megaxslt srcdir="gridarta/src/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="true" ending="xhtml" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="src/doc/transform.xslt"/>
- <transformation stylesheet="src/doc/cleanupXhtml11.xslt"/>
+ <transformation stylesheet="gridarta/src/doc/transform.xslt"/>
+ <transformation stylesheet="gridarta/src/doc/cleanupXhtml11.xslt"/>
</megaxslt>
<megaxslt srcdir="${build.dir}/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="false" ending="html" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="src/doc/xhtml2html.xslt"/>
+ <transformation stylesheet="gridarta/src/doc/xhtml2html.xslt"/>
</megaxslt>
- <megaxslt srcdir="src/doc" destdir="." includes="faq.xhtml" validatesource="true" validatedest="false" ending="" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
+ <megaxslt srcdir="gridarta/src/doc" destdir="." includes="faq.xhtml" validatesource="true" validatedest="false" ending="" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="src/doc/faq2txt.xslt"/>
+ <transformation stylesheet="gridarta/src/doc/faq2txt.xslt"/>
</megaxslt>
<copy file="faq" tofile="FAQ"/>
<copy todir="${build.dir}/doc">
- <fileset dir="src/doc">
+ <fileset dir="gridarta/src/doc">
<include name="**/.htaccess"/>
<include name="**/*.html"/>
<include name="dtd/**/*.mod"/>
@@ -672,9 +672,9 @@
<target name="apiDoc" description="Creates public javadoc documentation.">
<mkdir dir="${build.dir}/doc/api/${project.version}"/>
- <copy todir="${build.dir}/doc/api/${project.version}" file="src/doc/copyright.xhtml"/>
- <copy todir="${build.dir}/doc/api/${project.version}" file="src/doc/dev/api/.htaccess"/>
- <javadoc destdir="${build.dir}/doc/api/${project.version}" access="protected" author="yes" version="yes" locale="en_US" use="yes" splitindex="yes" windowtitle="Gridarta API documentation" doctitle="Gridarta<br />Yet another Java API<br />API Documentation" header="Gridarta ${project.version}<br />Yet another Java API<br />API Documentation" footer="Gridarta<br />Yet another Java API<br />API Documentation" bottom="<div style="text-align:center;">© 2005-2006 The Gridarta Developers. All rights reserved. See <a href="{@docRoot}/copyright.xhtml">copyright</a></div>" serialwarn="yes" charset="${build.source.encoding}" docencoding="${build.source.encoding}" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" overview="src/main/java/overview.html" link="${user.javadoc.link}">
+ <copy todir="${build.dir}/doc/api/${project.version}" file="gridarta/src/doc/copyright.xhtml"/>
+ <copy todir="${build.dir}/doc/api/${project.version}" file="gridarta/src/doc/dev/api/.htaccess"/>
+ <javadoc destdir="${build.dir}/doc/api/${project.version}" access="protected" author="yes" version="yes" locale="en_US" use="yes" splitindex="yes" windowtitle="Gridarta API documentation" doctitle="Gridarta<br />Yet another Java API<br />API Documentation" header="Gridarta ${project.version}<br />Yet another Java API<br />API Documentation" footer="Gridarta<br />Yet another Java API<br />API Documentation" bottom="<div style="text-align:center;">© 2005-2006 The Gridarta Developers. All rights reserved. See <a href="{@docRoot}/copyright.xhtml">copyright</a></div>" serialwarn="yes" charset="${build.source.encoding}" docencoding="${build.source.encoding}" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" overview="gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
<classpath>
<fileset dir="atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
@@ -693,8 +693,8 @@
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
- <packageset dir="src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/test/java" defaultexcludes="yes"/>
+ <packageset dir="gridarta/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="gridarta/src/test/java" defaultexcludes="yes"/>
<packageset dir="atrinik/src/main/java" defaultexcludes="yes"/>
<packageset dir="atrinik/src/test/java" defaultexcludes="yes"/>
<packageset dir="crossfire/src/main/java" defaultexcludes="yes"/>
@@ -734,19 +734,19 @@
<parallel>
<tar tarfile="${distSrc}.tar">
<tarfileset dir="." prefix="gridarta-${project.version}">
- <include name="src/**"/>
+ <include name="gridarta/src/**"/>
<include name="build.xml"/>
</tarfileset>
</tar>
<zip destfile="${distSrc}.zip">
<zipfileset dir="." prefix="gridarta-${project.version}">
- <include name="src/**"/>
+ <include name="gridarta/src/**"/>
<include name="build.xml"/>
</zipfileset>
</zip>
<jar destfile="${distSrc}.jar">
<zipfileset dir="." prefix="gridarta-${project.version}">
- <include name="src/**"/>
+ <include name="gridarta/src/**"/>
<include name="build.xml"/>
</zipfileset>
</jar>
@@ -809,14 +809,14 @@
</target>
<target name="releaseDist" description="Uploads distribution archives to sourceforge." if="developer.email" depends="checkDevMail, dist">
- <touch file="src/doc/api/start.xhtml" millis="0"/>
- <megaxslt srcdir="src/doc/api" destdir="src/doc/api" includes="start.xhtml" validatesource="true" validatedest="true" ending="xhtml" converttocanonical="true" checktimestamps="true">
+ <touch file="gridarta/src/doc/api/start.xhtml" millis="0"/>
+ <megaxslt srcdir="gridarta/src/doc/api" destdir="gridarta/src/doc/api" includes="start.xhtml" validatesource="true" validatedest="true" ending="xhtml" converttocanonical="true" checktimestamps="true">
<xmlcatalog refid="commonDTDs"/>
<parameter name="project.version" value="${project.version}"/>
- <transformation stylesheet="src/doc/api/release.xslt"/>
+ <transformation stylesheet="gridarta/src/doc/api/release.xslt"/>
</megaxslt>
<svn javahl="${user.svn.javahl}">
- <commit file="src/doc/api/start.xhtml" message="Updating API link to include ${project.version}."/>
+ <commit file="gridarta/src/doc/api/start.xhtml" message="Updating API link to include ${project.version}."/>
</svn>
<exec executable="rsync" failonerror="true">
<arg line="-auzv -e ssh ${build.dir}/doc/api/ ${user.rsync.username}@${user.rsync.host}:${user.rsync.dir}/htdocs/api/"/>
@@ -877,11 +877,11 @@
<target name="checkstyle" description="Runs checkstyle to style-check the source code">
<taskdef resource="checkstyletask.properties" classpath="lib/checkstyle-all-5.0.jar"/>
<mkdir dir="${build.dir}/doc"/>
- <checkstyle config="src/checkstyle.xml" failOnViolation="true">
+ <checkstyle config="gridarta/src/checkstyle.xml" failOnViolation="true">
<formatter type="plain" tofile="${build.dir}/doc/checkstyle_report.txt"/>
<formatter type="plain"/>
- <fileset dir="src/main/java" includes="**/*.java"/>
- <fileset dir="src/test/java" includes="**/*.java"/>
+ <fileset dir="gridarta/src/main/java" includes="**/*.java"/>
+ <fileset dir="gridarta/src/test/java" includes="**/*.java"/>
<fileset dir="atrinik/src/main/java" includes="**/*.java"/>
<fileset dir="atrinik/src/test/java" includes="**/*.java"/>
<fileset dir="crossfire/src/main/java" includes="**/*.java"/>
@@ -906,18 +906,18 @@
</target>
<target name="changelog" description="Updates the changelog">
- <exec executable="svn" output="src/doc/dev/changelog.xml">
+ <exec executable="svn" output="gridarta/src/doc/dev/changelog.xml">
<arg line="log -v --xml"/>
</exec>
- <megaxslt srcdir="src/doc/dev" destdir="src/doc/dev" includes="changelog.xml" validatesource="false" validatedest="false" ending="xhtml" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
+ <megaxslt srcdir="gridarta/src/doc/dev" destdir="gridarta/src/doc/dev" includes="changelog.xml" validatesource="false" validatedest="false" ending="xhtml" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="src/doc/dev/changelog.xslt"/>
+ <transformation stylesheet="gridarta/src/doc/dev/changelog.xslt"/>
</megaxslt>
</target>
<target name="javadoc" depends="init-properties" description="Creates the JavaDoc documentation for the complete editor source.">
<mkdir dir="${build.dir}/doc/dev/api"/>
- <javadoc destdir="${build.dir}/doc/dev/api" locale="en_US" version="yes" author="yes" use="yes" splitindex="yes" windowtitle="Gridarta — API Documentation" doctitle="Gridarta ${build.number}<br />API Documentation" header="Gridarta ${build.number}<br />API Documentation" footer="Gridarta ${build.number}<br />API Documentation" serialwarn="no" charset="utf-8" docencoding="utf-8" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" private="yes" overview="src/main/java/overview.html" link="${user.javadoc.link}">
+ <javadoc destdir="${build.dir}/doc/dev/api" locale="en_US" version="yes" author="yes" use="yes" splitindex="yes" windowtitle="Gridarta — API Documentation" doctitle="Gridarta ${build.number}<br />API Documentation" header="Gridarta ${build.number}<br />API Documentation" footer="Gridarta ${build.number}<br />API Documentation" serialwarn="no" charset="utf-8" docencoding="utf-8" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" private="yes" overview="gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
<classpath>
<fileset dir="atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
@@ -936,8 +936,8 @@
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
- <packageset dir="src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/test/java" defaultexcludes="yes"/>
+ <packageset dir="gridarta/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="gridarta/src/test/java" defaultexcludes="yes"/>
<packageset dir="atrinik/src/main/java" defaultexcludes="yes"/>
<packageset dir="atrinik/src/test/java" defaultexcludes="yes"/>
<packageset dir="crossfire/src/main/java" defaultexcludes="yes"/>
@@ -1073,7 +1073,7 @@
<path refid="path.lib.japi-swing-action"/>
<path refid="path.lib.junit"/>
<path refid="path.lib.log4j"/>
- <pathelement location="resource"/>
+ <pathelement location="gridarta/resource"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -1097,7 +1097,7 @@
<path refid="path.lib.japi-xml"/>
<path refid="path.lib.junit"/>
<path refid="path.lib.log4j"/>
- <pathelement location="resource"/>
+ <pathelement location="gridarta/resource"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
Copied: trunk/gridarta/gridarta.iml (from rev 9235, trunk/gridarta.iml)
===================================================================
--- trunk/gridarta/gridarta.iml (rev 0)
+++ trunk/gridarta/gridarta.iml 2013-05-28 20:00:26 UTC (rev 9237)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/resource" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/src/screenshots" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="model" />
+ <orderEntry type="module" module-name="preferences" />
+ <orderEntry type="module" module-name="plugin" />
+ <orderEntry type="module" module-name="textedit" />
+ <orderEntry type="module" module-name="utils" />
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="bsh-core" level="project" />
+ <orderEntry type="library" name="bsh-util" level="project" />
+ <orderEntry type="library" name="java-getopt" level="project" />
+ <orderEntry type="library" name="japi-lib-lang" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-about" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-action" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-extlib" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-misc" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-prefs" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-tod" level="project" />
+ <orderEntry type="library" name="japi-lib-util" level="project" />
+ <orderEntry type="library" name="japi-lib-xml" level="project" />
+ <orderEntry type="library" name="jdom" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
+ <orderEntry type="library" name="rsyntaxtextarea" level="project" />
+ </component>
+</module>
+
Deleted: trunk/gridarta.iml
===================================================================
--- trunk/gridarta.iml 2013-05-28 19:39:43 UTC (rev 9236)
+++ trunk/gridarta.iml 2013-05-28 20:00:26 UTC (rev 9237)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/resource" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/atrinik" />
- <excludeFolder url="file://$MODULE_DIR$/classes" />
- <excludeFolder url="file://$MODULE_DIR$/crossfire" />
- <excludeFolder url="file://$MODULE_DIR$/daimonin" />
- <excludeFolder url="file://$MODULE_DIR$/dest" />
- <excludeFolder url="file://$MODULE_DIR$/doc" />
- <excludeFolder url="file://$MODULE_DIR$/docs" />
- <excludeFolder url="file://$MODULE_DIR$/metrics" />
- <excludeFolder url="file://$MODULE_DIR$/src/screenshots" />
- <excludeFolder url="file://$MODULE_DIR$/teststuff" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="model" />
- <orderEntry type="module" module-name="preferences" />
- <orderEntry type="module" module-name="plugin" />
- <orderEntry type="module" module-name="textedit" />
- <orderEntry type="module" module-name="utils" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="bsh-core" level="project" />
- <orderEntry type="library" name="bsh-util" level="project" />
- <orderEntry type="library" name="java-getopt" level="project" />
- <orderEntry type="library" name="japi-lib-lang" level="project" />
- <orderEntry type="library" name="japi-lib-swing-about" level="project" />
- <orderEntry type="library" name="japi-lib-swing-action" level="project" />
- <orderEntry type="library" name="japi-lib-swing-extlib" level="project" />
- <orderEntry type="library" name="japi-lib-swing-misc" level="project" />
- <orderEntry type="library" name="japi-lib-swing-prefs" level="project" />
- <orderEntry type="library" name="japi-lib-swing-tod" level="project" />
- <orderEntry type="library" name="japi-lib-util" level="project" />
- <orderEntry type="library" name="japi-lib-xml" level="project" />
- <orderEntry type="library" name="jdom" level="project" />
- <orderEntry type="library" name="junit" level="project" />
- <orderEntry type="library" name="log4j" level="project" />
- <orderEntry type="library" name="rsyntaxtextarea" level="project" />
- </component>
-</module>
-
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-05-28 19:39:43 UTC (rev 9236)
+++ trunk/gridarta.ipr 2013-05-28 20:00:26 UTC (rev 9237)
@@ -1323,6 +1323,24 @@
<option name="FILTER_INFO" value="true" />
<option name="CUSTOM_FILTER" />
</component>
+ <component name="NullableNotNullManager">
+ <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
+ <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
+ <option name="myNullables">
+ <value>
+ <list size="0" />
+ </value>
+ </option>
+ <option name="myNotNulls">
+ <value>
+ <list size="3">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+ </list>
+ </value>
+ </option>
+ </component>
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
@@ -2155,7 +2173,7 @@
<module fileurl="file://$PROJECT_DIR$/atrinik/atrinik.iml" filepath="$PROJECT_DIR$/atrinik/atrinik.iml" />
<module fileurl="file://$PROJECT_DIR$/crossfire/crossfire.iml" filepath="$PROJECT_DIR$/crossfire/crossfire.iml" />
<module fileurl="file://$PROJECT_DIR$/daimonin/daimonin.iml" filepath="$PROJECT_DIR$/daimonin/daimonin.iml" />
- <module fileurl="file://$PROJECT_DIR$/gridarta.iml" filepath="$PROJECT_DIR$/gridarta.iml" />
+ <module fileurl="file://$PROJECT_DIR$/gridarta/gridarta.iml" filepath="$PROJECT_DIR$/gridarta/gridarta.iml" />
<module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
<module fileurl="file://$PROJECT_DIR$/plugin/plugin.iml" filepath="$PROJECT_DIR$/plugin/plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/preferences/preferences.iml" filepath="$PROJECT_DIR$/preferences/preferences.iml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-05-28 19:39:50
|
Revision: 9236
http://sourceforge.net/p/gridarta/code/9236
Author: akirschbaum
Date: 2013-05-28 19:39:43 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Move resource files into resources directories.
Modified Paths:
--------------
trunk/build.xml
Added Paths:
-----------
trunk/atrinik/src/main/resources/net/
trunk/atrinik/src/main/resources/net/sf/
trunk/atrinik/src/main/resources/net/sf/gridarta/
trunk/atrinik/src/main/resources/net/sf/gridarta/var/
trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/
trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/AtrinikEditor.properties
trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties
trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages.properties
trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages_de.properties
trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages_fr.properties
trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages_sv.properties
trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/tod.properties
trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/tod_de.properties
trunk/crossfire/src/main/resources/net/
trunk/crossfire/src/main/resources/net/sf/
trunk/crossfire/src/main/resources/net/sf/gridarta/
trunk/crossfire/src/main/resources/net/sf/gridarta/var/
trunk/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/
trunk/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/action.properties
trunk/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/messages.properties
trunk/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/messages_de.properties
trunk/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/messages_fr.properties
trunk/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/messages_sv.properties
trunk/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/tod.properties
trunk/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/tod_de.properties
trunk/daimonin/src/main/resources/net/
trunk/daimonin/src/main/resources/net/sf/
trunk/daimonin/src/main/resources/net/sf/gridarta/
trunk/daimonin/src/main/resources/net/sf/gridarta/var/
trunk/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/
trunk/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/DaimoninEditor.properties
trunk/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties
trunk/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/messages.properties
trunk/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/messages_de.properties
trunk/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/messages_fr.properties
trunk/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/messages_sv.properties
trunk/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/tod.properties
trunk/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/tod_de.properties
trunk/src/main/resources/cfpython_menu.def
trunk/src/main/resources/net/
trunk/src/main/resources/net/sf/
trunk/src/main/resources/net/sf/gridarta/
trunk/src/main/resources/net/sf/gridarta/action.properties
trunk/src/main/resources/net/sf/gridarta/gui/
trunk/src/main/resources/net/sf/gridarta/gui/panel/
trunk/src/main/resources/net/sf/gridarta/gui/panel/tools/
trunk/src/main/resources/net/sf/gridarta/gui/panel/tools/action.properties
trunk/src/main/resources/net/sf/gridarta/gui/panel/tools/action_de.properties
trunk/src/main/resources/net/sf/gridarta/gui/panel/tools/action_fr.properties
trunk/src/main/resources/net/sf/gridarta/gui/panel/tools/action_sv.properties
trunk/src/main/resources/net/sf/gridarta/messages.properties
trunk/src/main/resources/net/sf/gridarta/messages_de.properties
trunk/src/main/resources/net/sf/gridarta/messages_fr.properties
trunk/src/main/resources/net/sf/gridarta/messages_sv.properties
trunk/src/test/resources/net/
trunk/src/test/resources/net/sf/
trunk/src/test/resources/net/sf/gridarta/
trunk/src/test/resources/net/sf/gridarta/gui/
trunk/src/test/resources/net/sf/gridarta/gui/mapmenu/
trunk/src/test/resources/net/sf/gridarta/gui/mapmenu/testLoad1.properties
Removed Paths:
-------------
trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/AtrinikEditor.properties
trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/action.properties
trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages.properties
trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_de.properties
trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_fr.properties
trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_sv.properties
trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/tod.properties
trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/tod_de.properties
trunk/crossfire/src/main/java/net/sf/gridarta/var/crossfire/action.properties
trunk/crossfire/src/main/java/net/sf/gridarta/var/crossfire/messages.properties
trunk/crossfire/src/main/java/net/sf/gridarta/var/crossfire/messages_de.properties
trunk/crossfire/src/main/java/net/sf/gridarta/var/crossfire/messages_fr.properties
trunk/crossfire/src/main/java/net/sf/gridarta/var/crossfire/messages_sv.properties
trunk/crossfire/src/main/java/net/sf/gridarta/var/crossfire/tod.properties
trunk/crossfire/src/main/java/net/sf/gridarta/var/crossfire/tod_de.properties
trunk/daimonin/src/main/java/net/sf/gridarta/var/daimonin/DaimoninEditor.properties
trunk/daimonin/src/main/java/net/sf/gridarta/var/daimonin/action.properties
trunk/daimonin/src/main/java/net/sf/gridarta/var/daimonin/messages.properties
trunk/daimonin/src/main/java/net/sf/gridarta/var/daimonin/messages_de.properties
trunk/daimonin/src/main/java/net/sf/gridarta/var/daimonin/messages_fr.properties
trunk/daimonin/src/main/java/net/sf/gridarta/var/daimonin/messages_sv.properties
trunk/daimonin/src/main/java/net/sf/gridarta/var/daimonin/tod.properties
trunk/daimonin/src/main/java/net/sf/gridarta/var/daimonin/tod_de.properties
trunk/src/main/java/cfpython_menu.def
trunk/src/main/java/net/sf/gridarta/action.properties
trunk/src/main/java/net/sf/gridarta/gui/panel/tools/action.properties
trunk/src/main/java/net/sf/gridarta/gui/panel/tools/action_de.properties
trunk/src/main/java/net/sf/gridarta/gui/panel/tools/action_fr.properties
trunk/src/main/java/net/sf/gridarta/gui/panel/tools/action_sv.properties
trunk/src/main/java/net/sf/gridarta/messages.properties
trunk/src/main/java/net/sf/gridarta/messages_de.properties
trunk/src/main/java/net/sf/gridarta/messages_fr.properties
trunk/src/main/java/net/sf/gridarta/messages_sv.properties
trunk/src/test/java/net/sf/gridarta/gui/mapmenu/testLoad1.properties
Deleted: trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/AtrinikEditor.properties
===================================================================
--- trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/AtrinikEditor.properties 2013-05-28 19:12:45 UTC (rev 9235)
+++ trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/AtrinikEditor.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -1,23 +0,0 @@
-#
-# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
-# Copyright (C) 2000-2010 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.
-#
-
-setNormal=Sets the operation mode to normal.\nIn normal mode, the editor starts with GUI.\nCommand line arguments are maps to load immediately.
-setCollectArches=Collect arches from the command line.
-setBatchPNG=Reads all specified maps and creates PNG images for them.
-setSinglePNG=Take the first argument as map file and the second argument as PNG name to write the map to.
Deleted: trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/action.properties 2013-05-28 19:12:45 UTC (rev 9235)
+++ trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/action.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -1,71 +0,0 @@
-#
-# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
-# Copyright (C) 2000-2010 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.
-#
-
-# Warning: This file MUST be ISO-8859-1
-# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
-
-ActionBuilder.additionalBundles=net.sf.gridarta.var.atrinik.messages
-
-########
-# Menus
-main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
-map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
-archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
-#pickmaps.menu: See gridarta
-resources.menu=collectArches collectSpells - reloadFaces - viewTreasurelists
-tools.menu=newScript editScript - controlServer controlClient - validateMap cleanCompletelyBlockedSquares - zoom gc
-analyze.menu=
-view.menu=resetView - gridVisible lightVisible doubleFaces - prevWindow nextWindow
-plugins.menu=- editPlugins - savePlugins importPlugin
-window.menu=closeAllMaps
-help.menu=showHelp tipOfTheDay about update
-
-mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-
-mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
-mapwindowMap.menu=gridVisible lightVisible - goExit enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects openInClient
-mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
-
-##########
-# ToolBars
-main.toolbar=newMap openFile saveMap saveMapAs - prevWindow nextWindow - undo redo
-
-
-moveCursor.menu=moveCursorNorth moveCursorEast moveCursorSouth moveCursorWest moveCursorNorthEast moveCursorSouthEast moveCursorSouthWest moveCursorNorthWest - goLocation
-
-exitConnector.menu=exitCopy exitPaste exitConnect
-
-#control.toolbar=controlStart controlStop
-
-nextWindow.icon=navigation/Forward16
-
-prevWindow.icon=navigation/Back16
-
-
-license.1.file=License
-license.2.file=japi.jar-LICENSE
-license.3.file=jlfgr-1_0.jar-LICENSE
-license.4.file=log4j-1.2.13.jar-LICENSE
-
-about.logo=icons/atrinikLogoSmall.png
-
-update.url=http://www.atrinik.org/editor/update.properties
Deleted: trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages.properties
===================================================================
--- trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages.properties 2013-05-28 19:12:45 UTC (rev 9235)
+++ trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -1,179 +0,0 @@
-#
-# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
-# Copyright (C) 2000-2010 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.
-#
-
-# Warning: This file MUST be ISO-8859-1
-# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
-
-application.name=Gridarta for Atrinik
-mainWindow.title=Gridarta for Atrinik {0}
-
-configSources=net.sf.gridarta.var.atrinik.model.settings.FilesConfigSource net.sf.gridarta.var.atrinik.model.settings.CollectedConfigSource
-
-# configSource.<config source name>.<file type>.<sequence> values support the
-# following variables:
-# ${COLLECTED} collected directory (compile-time constant)
-# ${MAPS} maps directory (set in settings dialog)
-# ${ARCH} archetype directory (set in settings dialog)
-#
-# file types:
-# - treasures treasure lists
-#
-# config source name:
-# - COLLECTED collected archetypes (set in settings dialog)
-# - ARCH_DIRECTORY individual files in archetype directory (set in settings
-# dialog)
-configSource.COLLECTED.treasures.0=${COLLECTED}/treasures
-configSource.ARCH_DIRECTORY.treasures.0=${COLLECTED}/treasures
-
-configSource.image.name=atrinik.0
-configSource.face.name=bmaps
-configSource.face.output=%3$s
-configSource.facetree.name=facetree
-configSource.facetree.input=^(.*)
-configSource.facetree.output=%2$s
-
-# Internal version number of the included online-documentation. Increasing the
-# number causes an automated popup of the docu when users upgrade their editor
-# and run for the first time.
-docuVersion=1
-
-# Supported image set. The values must match the image file names:
-# <name>.<image set name>.111
-availableImageSets=
-
-# The default archetype directory.
-archDirectoryDefault=../arch
-
-# The default maps directory.
-mapsDirectoryDefault=../maps
-
-# Whether a media directory is used.
-mediaDirectory=true
-
-# The default media directory.
-mediaDirectoryDefault=../client/media
-
-# Whether an image set is used.
-imageSet=false
-
-# The default image set.
-imageSetDefault=
-
-##########
-# Dialogs
-warning=Warning!
-
-mapUnsaved.title=Map Not Saved
-mapUnsaved.message=Please save this map first.
-
-# Map Properties
-mapMap=Map
-mapRegion=Region
-mapWeather=Weather
-mapOutdoor=Outdoor
-mapOptions=Options
-mapNoSave=No Save
-mapNoMagic=No Magic
-mapNoPrayers=No Prayers
-mapNoHarm=No Harmful Spells
-mapNoSumm=No Summoning
-mapFixedLogin=Fixed Login
-mapUnique=Unique
-mapFixedResetTime=Fixed Reset Time
-mapPlayerNoSave=Players Cannot Save
-mapPvP=PvP Enabled
-mapText=Map Text
-
-
-#####################
-# Preference Modules
-
-# Options
-optionsTitle=Options
-optionsResMedia=Media
-optionsResMedia.shortdescription=<html>The media directory is for choosing background sounds for maps.<br>Please know that you cannot simply choose any media directory you want.<br>The background sound will only work if the files exist on the client as well.<br>Therefore, choosing a standard atrinik media directory is crucial.</html>
-
-
-#######
-# Map
-
-enterExit.accel=ctrl pressed NUMPAD5
-enterNorthMap.accel=ctrl pressed NUMPAD9
-enterNorthEastMap.accel=ctrl pressed NUMPAD6
-enterEastMap.accel=ctrl pressed NUMPAD3
-enterSouthEastMap.accel=ctrl pressed NUMPAD2
-enterSouthMap.accel=ctrl pressed NUMPAD1
-enterSouthWestMap.accel=ctrl pressed NUMPAD4
-enterWestMap.accel=ctrl pressed NUMPAD7
-enterNorthWestMap.accel=ctrl pressed NUMPAD8
-
-
-#######
-# Cursor
-
-moveCursorNorth.accel=NUMPAD9
-moveCursorNorthEast.accel=NUMPAD6
-moveCursorNorthEast.accel2=RIGHT
-moveCursorEast.accel=NUMPAD3
-moveCursorSouthEast.accel=NUMPAD2
-moveCursorSouthEast.accel2=DOWN
-moveCursorSouth.accel=NUMPAD1
-moveCursorSouthWest.accel=NUMPAD4
-moveCursorSouthWest.accel2=LEFT
-moveCursorWest.accel=NUMPAD7
-moveCursorNorthWest.accel=NUMPAD8
-moveCursorNorthWest.accel2=UP
-
-
-#######
-# Help
-
-about.title=About Gridarta for Atrinik
-about=<html><h1 align="center">Gridarta for Atrinik</h1><p>Editor for Atrinik MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html>
-
-aboutBuildProperties.title=Build properties
-
-
-#######################
-# Various Log Messages
-logDefArchWithInvalidMpartId=Arch part {0} has mpart_id {2}, but head part {1} has mpart_id {3}
-
-
-# Actions not to be shown in Configure Shortcuts
-shortcutsIgnoreActions=smoothing \
- scriptEditClose scriptEditCloseAll scriptEditCopy scriptEditCut scriptEditFind scriptEditFindAgain scriptEditNewScript scriptEditOpen scriptEditPaste scriptEditRedo scriptEditReplace scriptEditSave scriptEditSaveAs scriptEditUndo
-
-
-###########################
-# Map Validator definitions
-validator.0=net.sf.gridarta.model.validation.checks.ConnectionChecker system_connection_source system_connection_sink system_connection_sink2
-validator.1=net.sf.gridarta.model.validation.checks.BlockedSpawnPointChecker 81
-validator.2=net.sf.gridarta.model.validation.checks.BlockedMobOrSpawnPointChecker 80
-validator.3=net.sf.gridarta.model.validation.checks.ConnectedInsideContainerChecker
-validator.4=net.sf.gridarta.model.validation.checks.ConnectedPickableChecker
-validator.5=net.sf.gridarta.model.validation.checks.DoubleLayerChecker
-validator.6=net.sf.gridarta.model.validation.checks.EmptySpawnPointChecker 81
-validator.7=net.sf.gridarta.model.validation.checks.ExitChecker 66
-validator.8=net.sf.gridarta.model.validation.checks.MapDifficultyChecker 1 10000
-validator.9=net.sf.gridarta.model.validation.checks.MobOutsideSpawnPointChecker 80
-validator.10=net.sf.gridarta.model.validation.checks.TilePathsChecker 8
-validator.11=net.sf.gridarta.model.validation.checks.UndefinedArchetypeChecker
-validator.12=net.sf.gridarta.model.validation.checks.UndefinedFaceChecker
-validator.13=net.sf.gridarta.model.validation.checks.UnsetSlayingChecker 20,21,51,55,64,122
-validator.14=net.sf.gridarta.model.validation.checks.MapCheckerScriptChecker map-checker.py -c --text-only -a ${ARCH} -r ${MAPS}/regions.reg -m ${MAP}
Deleted: trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_de.properties
===================================================================
--- trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_de.properties 2013-05-28 19:12:45 UTC (rev 9235)
+++ trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_de.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -1,68 +0,0 @@
-#
-# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
-# Copyright (C) 2000-2010 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.
-#
-
-# Warning: This file MUST be ISO-8859-1
-# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
-
-application.name=Gridarta f\xFCr Atrinik
-mainWindow.title=Gridarta f\xFCr Atrinik {0}
-
-
-##########
-# Dialogs
-warning=Warnung!
-
-#mapUnsaved.title=
-#mapUnsaved.message=
-
-# Map Properties
-mapMap=Karte
-mapRegion=Region
-mapWeather=Wetter
-mapOutdoor=Im Freien
-mapOptions=Optionen
-mapNoSave=Nicht speichern
-mapNoMagic=Keine Magie
-mapNoPrayers=Keine Gebete
-mapNoHarm=Keine gef\xE4hrlichen Zauber
-mapNoSumm=Keine Herbeirufungszauber
-mapFixedLogin=Login am Startpunkt
-mapFixedResetTime=Fixer Reset
-mapPlayerNoSave=Spieler kann nicht speichern
-mapPvP=Spieler gegen Spieler aktiv
-mapPlugins=Plugins
-mapText=Kartentext
-
-
-#####################
-# Preference Modules
-
-# Options
-optionsTitle=Optionen
-#optionsResMedia=
-#optionsResMedia.shortdescription=
-
-
-#######
-# Help
-
-about.title=\xDCber Gridarta f\xFCr Atrinik
-about=<html><h1 align="center">Gridarta f\xFCr Atrinik</h1><p>Editor f\xFCr Atrinik MMORPG Karten und Objekte</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">Entwickler:</td><td>{2}</td></tr><tr><td align="right">Erstellung:</td><td>{3}</td></tr></table></html>
-
-#aboutBuildProperties.title=
Deleted: trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_fr.properties
===================================================================
--- trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_fr.properties 2013-05-28 19:12:45 UTC (rev 9235)
+++ trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_fr.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -1,71 +0,0 @@
-#
-# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
-# Copyright (C) 2000-2010 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.
-#
-
-# Warning: This file MUST be ISO-8859-1
-# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
-# Translation done by Marmoth
-
-application.name=Gridarta for Atrinik
-mainWindow.title=Gridarta for Atrinik {0}
-
-
-##########
-# Dialogs
-warning=Attention!
-
-#mapUnsaved.title=
-#mapUnsaved.message=
-
-# Map Properties
-#mapMap=
-#mapRegion=
-#mapWeather=
-#mapOutdoor=
-#mapOptions=
-#mapNoSave=
-#mapNoMagic=
-#mapNoPrayers=
-#mapNoHarm=
-#mapNoSumm=
-#mapFixedLogin=
-#mapUnique=
-#mapFixedResetTime=
-#mapPlayerNoSave=
-#mapPvP=
-#mapPlugins=
-#mapText=
-
-
-#####################
-# Preference Modules
-
-# Options
-#optionsTitle=
-#optionsUpdate=
-#optionsResMedia=
-#optionsResMedia.shortdescription=
-
-
-#######
-# Help
-
-#about.title=
-#about=
-
-#aboutBuildProperties.title=
Deleted: trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_sv.properties
===================================================================
--- trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_sv.properties 2013-05-28 19:12:45 UTC (rev 9235)
+++ trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_sv.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -1,69 +0,0 @@
-#
-# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
-# Copyright (C) 2000-2010 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.
-#
-
-# Warning: This file MUST be ISO-8859-1
-# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
-
-application.name=Gridarta for Atrinik
-mainWindow.title=Gridarta for Atrinik {0}
-
-
-##########
-# Dialogs
-warning=Varning!
-
-mapUnsaved.title=Kartan har inte sparats.
-mapUnsaved.message=Var v\xE4nlig och spara den h\xE4r kartan f\xF6rst.
-
-# Map Properties
-mapMap=Karta
-#mapRegion=
-#mapWeather=
-mapOutdoor=Utomhus
-mapOptions=Inst\xE4llningar
-mapNoSave=Ingen spara
-mapNoMagic=Ingen magi
-mapNoPrayers=Inga b\xF6ner
-mapNoHarm=Inga farliga trollformler
-mapNoSumm=Ingen \xE5kallning
-mapFixedLogin=Fixerad inloggning
-#mapUnique=
-#mapFixedResetTime=
-#mapPlayerNoSave=
-mapPvP=Spelare mot Spelare
-#mapPlugins=
-mapText=Karttext
-
-
-#####################
-# Preference Modules
-
-# Options
-optionsTitle=Inst\xE4llningar
-optionsResMedia=Media
-optionsResMedia.shortdescription=<html>Mediakatalogen anv\xE4nds f\xF6r att v\xE4lja bakgrundsljud till kartor.<br>Observera att det inte g\xE5r att v\xE4lja vilka filer som helst.<br>Bakgrundsljud fungerar enbart om filen finns i klienten ocks\xE5.<br>D\xE4rf\xF6r \xE4r det viktigt att v\xE4lja en Atrinik standardkatalog f\xF6r media.</html>
-
-
-#######
-# Help
-
-about.title=Om Gridarta for Atrinik
-about=<html><h1 align="center">Gridarta for Daimoin</h1><p>Editor for Atrinik MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Build number:</td><td>{1}</td></tr><tr><td align="right">av:</td><td>{2}</td></tr><tr><td align="right">datum:</td><td>{3}</td></tr></table></html>
-
-aboutBuildProperties.title=Build properties
Deleted: trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/tod.properties
===================================================================
--- trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/tod.properties 2013-05-28 19:12:45 UTC (rev 9235)
+++ trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/tod.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -1,59 +0,0 @@
-#
-# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
-# Copyright (C) 2000-2010 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.
-#
-
-# Warning: This file MUST be ISO-8859-1
-# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
-#
-# Tip Of The Day
-
-tod.text.1=<html>You can as well cycle through the tips using the arrow keys<br>(Arrow left / Arrow right)
-tod.text.2=<html>This Tip Of The Day window is non-modal.<p>That means the window may stay open while using the editor.
-tod.text.3=<html>You can online update the editor to get the latest version.<p>Menu: <code>Help -> Update</code>.<br>Keyboard: <kbd>Ctrl-U</kbd>.<p>This will update the editor to the latest build available (nightly build).
-tod.text.4=<html>You can quickly cycle through open windows.<p>Menu: <code>View->Previous / Next Window</code>.<br>Keyboard: <kbd>Shift-Page Up</kbd> / <kbd>Shift-Page Down</kbd>.
-tod.text.5=<html>You can display half-height walls stacked in the same way the client does.<p>Menu: <code>View->Draw Double Faces</code><br>Keyboard: <kbd>Ctrl+Shift-G</kbd>.
-tod.text.6=<html>On most systems, <em>Atrinik Editor runs fastest at 32 Bit colour depth</em>.<p>This is because the editor uses transparency (Alpha Channel).
-tod.text.7=<html>You can quickly move through tiled attached maps.<p>Hold <kbd>Ctrl</kbd> and use the numpad with the same directions as the client.
-tod.text.8=<html>How to use the mouse?<ul><li>To <em>select</em> squares, use the left mouse button.<li>To <em>paint</em> (insert arches), use the right mouse button.<li>To <em>delete</em>, use the middle mouse button or hold Ctrl and use the right mouse button.</ul>
-tod.text.9=<html>You can select all squares of a map at once.<p>Menu: <code>Edit -> Select All</code><br>Keyboard: <kbd>Ctrl-A</kbd>.
-tod.text.10=<html>You can random paint by selecting a pickmap and painting.<p>Try this:<br>Select the "plants1" pickmap,<br>then paint with the right mouse button.
-tod.text.11=<html>All tiled maps of Atrinik are of size 24\xD724?<p>Your maps should be 24\xD724 as well.
-tod.text.12=<html>You can create random maps quite fast? Try this:<ol><li>Create a new map.<li>Select the entire map using Edit -> Select All or Ctrl-A<li>Select the "grass" pickmap (do not select a square in the pickmap)<li>Use Edit -> Random Fill Above or Ctrl-D<li>When asked for a fill seed value, simply press OK or Return (enter nothing).<li>Select the "trees1" pickmap (do not select a square in the pickmap)<li>Use Edit -> Random Fill Above or Ctrl-D<li>When asked for a fill seed value, now enter 3.</ol>Nice, isn''t it?
-tod.text.13=<html>Maps can be tiled using absolute and relative paths.<p><em>Relative paths</em> are good for paths to maps from the same map set.<br><em>Absolute paths</em> are good for paths to maps from another map set.<p>The "RA"-Switch in the Map Properties can be used to individually convert absolute to relative paths and vice versa.
-tod.text.14=<html>The editor runs better on Linux than on Windows.\nIt runs faster and smoother on Linux.
-tod.text.15=<html>You can control the client.<p>Menu: <code>Tools -> Control Client</code>.<p>There you can start and stop the client as well as see its console output.
-tod.text.16=<html>You can control the server.<p>Menu: <code>Tools -> Control Server</code>.<p><em><strong>Warning</strong>: This feature is experimental and might result in stale servers (zombies).</em>
-tod.text.17=<html>The editor was developed on Linux, mainly using vim, Ant and <em>IntelliJ IDEA 5</em>.<p>JetBrains (<a href="http://www.jetbrains.com/">http://www.jetbrains.com/</a>) gave us a license for IntelliJ IDEA. Thanks alot, JetBrains!<br><img src="http://www.jetbrains.com/idea/opensource/img/banners/idea88x31_blue.gif" alt="JetBrains">
-tod.text.18=<html>You can easily make a false wall.<p>Change the Special attribute "blocking passage" to false or set <code>no_pass 0</code>.
-tod.text.19=<html>The difference between an exit and a teleporter:<p>An exit always works while a teleporter needs a connection to be activated.
-tod.text.20=<html>You can make anything glow (emit light), even mob.<p>Set the "glow radius" attribute (<code>glow_radius 1</code> for instance).<p>If you want to have a mob glow, be sure to set glow radius on the mob, not the spawn point.
-tod.text.21=<html>To create a spawn point that spawns a mob, do this:<ol><li>Select "spawn_point" from the mobs Arch List.<li>Insert the spawn point.<li>Choose the mob you want to spawn from the mobs Arch List.<li>Use "Add Inv" to put the mob in the spawn point</ol>Done.
-tod.text.22=<html>Pickmaps are an often underestimated feature.
-tod.text.23=<html>The 10 most recently opened maps are quickly accessible.<p>Menu: <code>File -> Recent -> ...</code><br>Keyboard: <kbd>Alt-n</kbd> with n being a digit (1..9, 0)
-tod.text.24=<html>To collect arches for your server, do this:<ol><li>Change the settings to not load arches from collection (<code>File -> Options, Global)<li>Restart the editor<li>Use <code>Resources -> Collect Arches<li>Run the install script of the server</ol>
-tod.text.25=<html>How can you speed up the editor?<ul><li>Load arches from the collection<li>Use Linux<li>Use the latest Java version available<li>Use 32 Bit colour depth</ul>
-tod.text.26=<html>The editor does not load all images at startup.<p>Instead, it loads images as needed.<p>This is called "lazy image loading".
-tod.text.27=<html>The zoom feature knows different zoom resolutions.<p>This is a nice feature especially for map artists that want to publish previews.
-tod.text.28=<html>Many features have tooltips to help you.<p>Just hover the mouse over the thing you want to know about for a while.
-tod.text.29=<html>To attach a map to other maps, you must save it first.
-tod.text.30=<html>The editor runs even better when using Java 6.0 (Java2 1.6).
-tod.text.31=<html>You should stick to the default map size (24\xD724).<br>That map size is also best for the server.
-tod.text.32=<html>Beware when editing large maps. You might run out of memory.<br>Be sure to increase the heap size (-Xmx parameter) of Gridarta''s Virtual Machine when editing large maps (e.g. 240\xD7240).
-tod.text.33=<html>It''s amazing how much archetypes you could find using "Search archetype".<p>Menu: <code>Archetypes -> Find archetype</code>.
-tod.text.34=<html>You can quickly switch to the game object text editor with <code>CTRl-ALT-E</code>. Press these keys again to close it.
-tod.text.35=<html>To navigate to maps connected through exits, select Map|Go To Exit... or press <kbd>Ctrl-F12</kbd>. Then select the exit and press <kbd>Enter</kbd>.
Deleted: trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/tod_de.properties
===================================================================
--- trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/tod_de.properties 2013-05-28 19:12:45 UTC (rev 9235)
+++ trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/tod_de.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -1,55 +0,0 @@
-#
-# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
-# Copyright (C) 2000-2010 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.
-#
-
-# Warning: This file MUST be ISO-8859-1
-# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
-#
-# Tip Of The Day
-
-tod.text.1=<html>Sie k\xF6nnen mit Hilfe der Pfeiltasten durch die Tipps navigieren.<br>(Pfeil links / Pfeil rechts)
-tod.text.2=<html>Dieses Tipps-Fenster ist nicht modal.<p>Das bedeutet, Sie k\xF6nnen es offen lassen, w\xE4hrend Sie den Editor verwenden.
-tod.text.3=<html>Sie k\xF6nnen den Editor online aktualisieren, um die neueste Version zu erhalten.<p>Men\xFC: <code>Hilfe -> Aktualisieren</code>.<br>Tastatur: <kbd>Strg-U</kbd>.<p>Das wird den Editor auf die neueste verf\xFCgbare Version aktualisieren (nightly build).
-tod.text.4=<html>Sie k\xF6nnen schnell zwischen ge\xF6ffneten Fenstern wechseln.<p>Men\xFC: <code>Ansicht->Vorheriges / N\xE4chstes Fenster.</code>.<br>Tastatur: <kbd>Umschalt-Bild Auf</kbd> / <kbd>Umschalt-Bild Ab</kbd>.
-tod.text.5=<html>Sie k\xF6nnen halbhohe W\xE4nde genauso wie der Client gestapelt anzeigen lassen.<p>Men\xFC: <code>Ansicht->Zeichne doppelte Grafiken</code><br>Tastatur: <kbd>Strg+Umschalt-G</kbd>.
-tod.text.6=<html>Auf den meisten Systemen l\xE4uft <em>Gridarta am schnellsten in 32 Bit Farbtiefe</em>.<p>Das ist so weil der Editor Transparenz verwendet (Alpha-Kanal).
-tod.text.7=<html>Sie k\xF6nnen sich schnell durch verbundene Karten bewegen.<p>Halten Sie <kbd>Strg</kbd> gedr\xFCckt und verwenden Sie den Ziffernblock wie im Client.
-tod.text.8=<html>Wie man die Maus benutzt?<ul><li>Zum <em>Selektieren</em>, linke Maustaste.<li>Zum <em>Einf\xFCgen</em>, rechte Maustaste.<li>Zum <em>L\xF6schen</em>: mittlere Maustaste oder Strg+rechte Maustaste.</ul>
-tod.text.9=<html>Sie k\xF6nnen alle Felder einer Karte gleichzeitig selektieren.<p>Men\xFC: <code>Bearbeiten -> Alles ausw\xE4hlen</code><br>Tastatur: <kbd>Strg-A</kbd>.
-tod.text.10=<html>Sie k\xF6nnen zuf\xE4llige Objekte aus einer Pickmap einf\xFCgen.<p>Versuchen Sie''s:<br>W\xE4hlen Sie die "plants1" pickmap,<br>malen Sie dann mit der rechten Maustaste.
-tod.text.11=<html>Alle verbundenen Karten von Atrinik sind 24\xD724 gro\xDF.<p>Ihre Karten sollten auch 24\xD724 gro\xDF sein.
-tod.text.12=<html>Man kann zuf\xE4llige Karten sehr schnell erstellen.<ol><li>Leere Karte erstellen.<li>Die ganze Karte ausw\xE4hlen<li>Die "gras" pickmap ausw\xE4hlen (kein Feld in der Pickmap ausw\xE4hlen!)<li>Verwenden Sie Bearbeiten -> Zuf\xE4llig oben f\xFCllen<li>Wenn nach dem Prozentsatz gefragt wird, einfach OK dr\xFCcken.<li>W\xE4hlen Sie die "trees1" pickmap.<li>Benutzen Sie wieder zuf\xE4llig oben f\xFCllen, diesmal mit dem Wert 3.</ol>Sch\xF6n, nicht wahr?
-tod.text.17=<html>Der Editor wurde unter Linux entwickelt, haupts\xE4chlich mit vim, Ant und <em>IntelliJ IDEA 6</em>.<p>JetBrains (<a href="http://www.jetbrains.com/">http://www.jetbrains.com/</a>) gaben uns eine kostenlose Lizenz f\xFCr IntelliJ IDEA. Vielen Dank, JetBrains!<br><img src="http://www.jetbrains.com/idea/opensource/img/banners/idea88x31_blue.gif" alt="JetBrains">
-#tod.text.18=
-#tod.text.19=
-#tod.text.20=
-#tod.text.21=
-#tod.text.22=
-tod.text.23=<html>Sie k\xF6nnen die letzten 10 ge\xF6ffneten Karten einfach erreichen.<p>Men\xFC: <code>Datei -> Zuletzt ge\xF6ffnet -> ...</code><br>Tastatur: <kbd>Alt-n</kbd> wobei n eine Ziffer ist (1..9, 0)
-#tod.text.24=
-tod.text.25=<html>Wie kann man den Editor beschleunigen?<ul><li>Vorbereitete Archetypen laden<li>Linux verwenden<li>Die aktuelle Java-Version verwenden<li>32 Bit Farbtiefe verwenden</ul>
-tod.text.26=<html>Der Editor l\xE4dt beim Start nicht alle Bilder.<p>Diese werden erst dann geladen, wenn sie tats\xE4chlich ben\xF6tigt werden.<p>Dieses Verfahren nennt man "lazy image loading".
-tod.text.27=<html>Das Werkzeug "Zoom" unterst\xFCtzt verschiedene Verg\xF6\xDFerungsstufen.<p>Dadurch ist es ein interessantes Feature f\xFCr Autoren, die Ansichten ihrer Karten ver\xF6ffentlichen m\xF6chten.
-tod.text.28=<html>Viele Features haben Tooltips.<p>Bleiben Sie mit der Maus \xFCber dem Element, f\xFCr das Sie Hilfe ben\xF6tigen, f\xFCr eine Weile stehen.
-tod.text.29=<html>Um eine Karte mit anderen Karten zu verbinden m\xFCssen Sie diese zuerst sichern.
-#tod.text.30=
-#tod.text.31=
-tod.text.32=<html>Vorsicht beim Bearbeiten von gro\xDFen Karten: der Platz im Hauptspeicher k\xF6nnte nicht ausreichen.<br>Vergr\xF6\xDFern Sie die "heap size" (Parameter -Xmx beim Aufruf von java) von Gridarta, wenn Sie gro\xDFe Karten (bspw. 240\xD7240) bearbeiten m\xF6chten.
-tod.text.33=<html>Es ist verbl\xFCffend, wie viele Archetypen man mit "Archetypen finden" entdecken kann.<p>Men\xFC: <code>Archetypen -> Archetypen finden</code>.
-tod.text.34=<html>Sie k\xF6nnen den Objekt-Editor \xFCber die Tastenkombination <code>CTRl-ALT-E</code> \xF6ffnen. Dieselbe Tastenkombination schlie\xDFt ihn wieder.
-tod.text.35=<html>Sie k\xF6nnen Karten hinter Ausg\xE4ngen \xFCber <code>Karte -> Folge Ausgang...</code> oder \xFCber die Tastenkombination <code>CTRL-F12</code> \xF6ffnen.
Copied: trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/AtrinikEditor.properties (from rev 9235, trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/AtrinikEditor.properties)
===================================================================
--- trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/AtrinikEditor.properties (rev 0)
+++ trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/AtrinikEditor.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -0,0 +1,23 @@
+#
+# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+# Copyright (C) 2000-2010 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.
+#
+
+setNormal=Sets the operation mode to normal.\nIn normal mode, the editor starts with GUI.\nCommand line arguments are maps to load immediately.
+setCollectArches=Collect arches from the command line.
+setBatchPNG=Reads all specified maps and creates PNG images for them.
+setSinglePNG=Take the first argument as map file and the second argument as PNG name to write the map to.
Property changes on: trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/AtrinikEditor.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Copied: trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties (from rev 9235, trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/action.properties)
===================================================================
--- trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties (rev 0)
+++ trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -0,0 +1,71 @@
+#
+# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+# Copyright (C) 2000-2010 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.
+#
+
+# Warning: This file MUST be ISO-8859-1
+# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
+
+ActionBuilder.additionalBundles=net.sf.gridarta.var.atrinik.messages
+
+########
+# Menus
+main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
+archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
+#pickmaps.menu: See gridarta
+resources.menu=collectArches collectSpells - reloadFaces - viewTreasurelists
+tools.menu=newScript editScript - controlServer controlClient - validateMap cleanCompletelyBlockedSquares - zoom gc
+analyze.menu=
+view.menu=resetView - gridVisible lightVisible doubleFaces - prevWindow nextWindow
+plugins.menu=- editPlugins - savePlugins importPlugin
+window.menu=closeAllMaps
+help.menu=showHelp tipOfTheDay about update
+
+mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
+
+mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+mapwindowMap.menu=gridVisible lightVisible - goExit enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects openInClient
+mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
+
+##########
+# ToolBars
+main.toolbar=newMap openFile saveMap saveMapAs - prevWindow nextWindow - undo redo
+
+
+moveCursor.menu=moveCursorNorth moveCursorEast moveCursorSouth moveCursorWest moveCursorNorthEast moveCursorSouthEast moveCursorSouthWest moveCursorNorthWest - goLocation
+
+exitConnector.menu=exitCopy exitPaste exitConnect
+
+#control.toolbar=controlStart controlStop
+
+nextWindow.icon=navigation/Forward16
+
+prevWindow.icon=navigation/Back16
+
+
+license.1.file=License
+license.2.file=japi.jar-LICENSE
+license.3.file=jlfgr-1_0.jar-LICENSE
+license.4.file=log4j-1.2.13.jar-LICENSE
+
+about.logo=icons/atrinikLogoSmall.png
+
+update.url=http://www.atrinik.org/editor/update.properties
Property changes on: trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Copied: trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages.properties (from rev 9235, trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages.properties)
===================================================================
--- trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages.properties (rev 0)
+++ trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -0,0 +1,179 @@
+#
+# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+# Copyright (C) 2000-2010 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.
+#
+
+# Warning: This file MUST be ISO-8859-1
+# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
+
+application.name=Gridarta for Atrinik
+mainWindow.title=Gridarta for Atrinik {0}
+
+configSources=net.sf.gridarta.var.atrinik.model.settings.FilesConfigSource net.sf.gridarta.var.atrinik.model.settings.CollectedConfigSource
+
+# configSource.<config source name>.<file type>.<sequence> values support the
+# following variables:
+# ${COLLECTED} collected directory (compile-time constant)
+# ${MAPS} maps directory (set in settings dialog)
+# ${ARCH} archetype directory (set in settings dialog)
+#
+# file types:
+# - treasures treasure lists
+#
+# config source name:
+# - COLLECTED collected archetypes (set in settings dialog)
+# - ARCH_DIRECTORY individual files in archetype directory (set in settings
+# dialog)
+configSource.COLLECTED.treasures.0=${COLLECTED}/treasures
+configSource.ARCH_DIRECTORY.treasures.0=${COLLECTED}/treasures
+
+configSource.image.name=atrinik.0
+configSource.face.name=bmaps
+configSource.face.output=%3$s
+configSource.facetree.name=facetree
+configSource.facetree.input=^(.*)
+configSource.facetree.output=%2$s
+
+# Internal version number of the included online-documentation. Increasing the
+# number causes an automated popup of the docu when users upgrade their editor
+# and run for the first time.
+docuVersion=1
+
+# Supported image set. The values must match the image file names:
+# <name>.<image set name>.111
+availableImageSets=
+
+# The default archetype directory.
+archDirectoryDefault=../arch
+
+# The default maps directory.
+mapsDirectoryDefault=../maps
+
+# Whether a media directory is used.
+mediaDirectory=true
+
+# The default media directory.
+mediaDirectoryDefault=../client/media
+
+# Whether an image set is used.
+imageSet=false
+
+# The default image set.
+imageSetDefault=
+
+##########
+# Dialogs
+warning=Warning!
+
+mapUnsaved.title=Map Not Saved
+mapUnsaved.message=Please save this map first.
+
+# Map Properties
+mapMap=Map
+mapRegion=Region
+mapWeather=Weather
+mapOutdoor=Outdoor
+mapOptions=Options
+mapNoSave=No Save
+mapNoMagic=No Magic
+mapNoPrayers=No Prayers
+mapNoHarm=No Harmful Spells
+mapNoSumm=No Summoning
+mapFixedLogin=Fixed Login
+mapUnique=Unique
+mapFixedResetTime=Fixed Reset Time
+mapPlayerNoSave=Players Cannot Save
+mapPvP=PvP Enabled
+mapText=Map Text
+
+
+#####################
+# Preference Modules
+
+# Options
+optionsTitle=Options
+optionsResMedia=Media
+optionsResMedia.shortdescription=<html>The media directory is for choosing background sounds for maps.<br>Please know that you cannot simply choose any media directory you want.<br>The background sound will only work if the files exist on the client as well.<br>Therefore, choosing a standard atrinik media directory is crucial.</html>
+
+
+#######
+# Map
+
+enterExit.accel=ctrl pressed NUMPAD5
+enterNorthMap.accel=ctrl pressed NUMPAD9
+enterNorthEastMap.accel=ctrl pressed NUMPAD6
+enterEastMap.accel=ctrl pressed NUMPAD3
+enterSouthEastMap.accel=ctrl pressed NUMPAD2
+enterSouthMap.accel=ctrl pressed NUMPAD1
+enterSouthWestMap.accel=ctrl pressed NUMPAD4
+enterWestMap.accel=ctrl pressed NUMPAD7
+enterNorthWestMap.accel=ctrl pressed NUMPAD8
+
+
+#######
+# Cursor
+
+moveCursorNorth.accel=NUMPAD9
+moveCursorNorthEast.accel=NUMPAD6
+moveCursorNorthEast.accel2=RIGHT
+moveCursorEast.accel=NUMPAD3
+moveCursorSouthEast.accel=NUMPAD2
+moveCursorSouthEast.accel2=DOWN
+moveCursorSouth.accel=NUMPAD1
+moveCursorSouthWest.accel=NUMPAD4
+moveCursorSouthWest.accel2=LEFT
+moveCursorWest.accel=NUMPAD7
+moveCursorNorthWest.accel=NUMPAD8
+moveCursorNorthWest.accel2=UP
+
+
+#######
+# Help
+
+about.title=About Gridarta for Atrinik
+about=<html><h1 align="center">Gridarta for Atrinik</h1><p>Editor for Atrinik MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html>
+
+aboutBuildProperties.title=Build properties
+
+
+#######################
+# Various Log Messages
+logDefArchWithInvalidMpartId=Arch part {0} has mpart_id {2}, but head part {1} has mpart_id {3}
+
+
+# Actions not to be shown in Configure Shortcuts
+shortcutsIgnoreActions=smoothing \
+ scriptEditClose scriptEditCloseAll scriptEditCopy scriptEditCut scriptEditFind scriptEditFindAgain scriptEditNewScript scriptEditOpen scriptEditPaste scriptEditRedo scriptEditReplace scriptEditSave scriptEditSaveAs scriptEditUndo
+
+
+###########################
+# Map Validator definitions
+validator.0=net.sf.gridarta.model.validation.checks.ConnectionChecker system_connection_source system_connection_sink system_connection_sink2
+validator.1=net.sf.gridarta.model.validation.checks.BlockedSpawnPointChecker 81
+validator.2=net.sf.gridarta.model.validation.checks.BlockedMobOrSpawnPointChecker 80
+validator.3=net.sf.gridarta.model.validation.checks.ConnectedInsideContainerChecker
+validator.4=net.sf.gridarta.model.validation.checks.ConnectedPickableChecker
+validator.5=net.sf.gridarta.model.validation.checks.DoubleLayerChecker
+validator.6=net.sf.gridarta.model.validation.checks.EmptySpawnPointChecker 81
+validator.7=net.sf.gridarta.model.validation.checks.ExitChecker 66
+validator.8=net.sf.gridarta.model.validation.checks.MapDifficultyChecker 1 10000
+validator.9=net.sf.gridarta.model.validation.checks.MobOutsideSpawnPointChecker 80
+validator.10=net.sf.gridarta.model.validation.checks.TilePathsChecker 8
+validator.11=net.sf.gridarta.model.validation.checks.UndefinedArchetypeChecker
+validator.12=net.sf.gridarta.model.validation.checks.UndefinedFaceChecker
+validator.13=net.sf.gridarta.model.validation.checks.UnsetSlayingChecker 20,21,51,55,64,122
+validator.14=net.sf.gridarta.model.validation.checks.MapCheckerScriptChecker map-checker.py -c --text-only -a ${ARCH} -r ${MAPS}/regions.reg -m ${MAP}
Property changes on: trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Copied: trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages_de.properties (from rev 9235, trunk/atrinik/src/main/java/net/sf/gridarta/var/atrinik/messages_de.properties)
===================================================================
--- trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages_de.properties (rev 0)
+++ trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages_de.properties 2013-05-28 19:39:43 UTC (rev 9236)
@@ -0,0 +1,68 @@
+#
+# Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+# Copyright (C) 2000-2010 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.
+#
+
+# Warning: This file MUST be ISO-8859-1
+# See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding
+
+application.name=Gridarta f\xFCr Atrinik
+mainWindow.title=Gridarta f\xFCr Atrinik {0}
+
+
+##########
+# Dialogs
+warning=Warnung!
+
+#mapUnsaved.title=
+#mapUnsaved.message=
+
+# Map Properties
+mapMap=Karte
+mapRegion=Region
+mapWeather=Wetter
+mapOutdoor=Im Freien
+mapOptions=Optionen
+mapNoSave=Nicht speichern
+mapNoMagic=Keine Magie
+mapNoPrayers=Keine Gebete
+mapNoHarm=Keine gef\xE4hrlichen Zauber
+mapNoSumm=Keine Herbeirufungszauber
+mapFixedLogin=Login am Startpunkt
+mapFixedResetTime=Fixer Reset
+mapPlayerNoSave=Spieler kann nicht speichern
+mapPvP=Spieler gegen Spieler aktiv
+mapPlugins=Plugins
+mapText=Kartentext
+
+
+#####################
+# Preference Modules
+
+# Options
+optionsTitle=Optionen
+#optionsResMedia=
+#optionsResMedia.shortdescription=
+
+
+#######
+# Help
+
+about.title=\xDCber Gridarta f\xFCr Atrinik
+about=<html><h1 align="center">Gridarta f\xFCr Atrinik</h1><p>Editor f\xFCr Atrinik MMORPG Karten und Objekte</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">Entwickler:</td><td>{2}</td></tr><tr><td align="right">Erstellung:</td><td>{3}</td></tr></table></html>
+
+#aboutBuildProperties.title=
Property changes on: trunk/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages_de.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Copied: trunk/atrinik/src/main/resources/net/sf/gridarta/va...
[truncated message content] |
![http://www.jetbrains.com/idea/opensource/img/banners/idea88x31_blue.gif"](http://www.jetbrains.com/idea/opensource/img/banners/idea88x31_blue.gif"){kind=link}