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...> - 2014-02-13 21:18:02
|
Revision: 9560 http://sourceforge.net/p/gridarta/code/9560 Author: akirschbaum Date: 2014-02-13 21:18:00 +0000 (Thu, 13 Feb 2014) Log Message: ----------- Update INSTALL file. Modified Paths: -------------- trunk/INSTALL Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2014-01-27 07:14:48 UTC (rev 9559) +++ trunk/INSTALL 2014-02-13 21:18:00 UTC (rev 9560) @@ -78,19 +78,19 @@ user. To provide a build, edit the value of "update.url" in the action.properties -file for the editor variant. Then create or edit the file -"developer.properties" in the project's root directory. +file for the editor variant. Then create or edit the file "build.developer" in +the project's root directory. + Add the following entries: - - build.developer=Name of the developer providing the build. - - user.update.url.atrinik=Download URL to AtrinikEditor.jar. - - user.update.url.crossfire=Download URL to CrossfireEditor.jar. - - user.update.url.daimonin=Download URL to DaimoninEditor.jar. -The definitions of user.update.url.* are optional for editor variants not -provided. + - buildDeveloper=Name of the developer providing the build. + - updateUrlAtrinik=Download URL to AtrinikEditor.jar. + - updateUrlCrossfire=Download URL to CrossfireEditor.jar. + - updateUrlDaimonin=Download URL to DaimoninEditor.jar. +The definitions of updateUrl* are optional for editor variants not provided. Run "./gradlew preparePublish". This compiles the editors and creates the file "update.properties" for the editor variants to publish. The result is in src/{atrinik,crossfire,daimonin}/build/libs. Upload the contents of src/{atrinik,crossfire,daimonin}/build/libs. The files -atrinik.jar, crossfire.jar, and daimonin.jar can be omitted. +atrinik.jar, crossfire.jar, and daimonin.jar should be omitted. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-27 07:14:51
|
Revision: 9559 http://sourceforge.net/p/gridarta/code/9559 Author: akirschbaum Date: 2014-01-27 07:14:48 +0000 (Mon, 27 Jan 2014) Log Message: ----------- Remove accesses to non-existent paths. Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2014-01-26 20:51:52 UTC (rev 9558) +++ trunk/build.xml 2014-01-27 07:14:48 UTC (rev 9559) @@ -704,9 +704,6 @@ <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="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"/> <fileset dir="repo" includes="**/*.jar" excludes="*.jar-LICENSE"/> </classpath> @@ -953,9 +950,6 @@ <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/gridarta/src/main/java/overview.html" link="${user.javadoc.link}"> <classpath> - <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"/> <fileset dir="repo" includes="**/*.jar" excludes="*.jar-LICENSE"/> </classpath> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:51:58
|
Revision: 9558 http://sourceforge.net/p/gridarta/code/9558 Author: akirschbaum Date: 2014-01-26 20:51:52 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Save modified plugin scripts. Modified Paths: -------------- trunk/src/atrinik/ChangeLog trunk/src/crossfire/ChangeLog trunk/src/daimonin/ChangeLog trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractPluginParameter.java trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractStringPluginParameter.java trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractValuePluginParameter.java trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/BooleanParameter.java trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/DoubleParameter.java trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/IntegerParameter.java trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameter.java Added Paths: ----------- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterListener.java Modified: trunk/src/atrinik/ChangeLog =================================================================== --- trunk/src/atrinik/ChangeLog 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/atrinik/ChangeLog 2014-01-26 20:51:52 UTC (rev 9558) @@ -1,3 +1,7 @@ +2014-01-26 Andreas Kirschbaum + + * Save modified plugin scripts. + 2014-01-24 Andreas Kirschbaum * Properly enable/disable Edit|Grow/Shrink Selection menu. Modified: trunk/src/crossfire/ChangeLog =================================================================== --- trunk/src/crossfire/ChangeLog 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/crossfire/ChangeLog 2014-01-26 20:51:52 UTC (rev 9558) @@ -1,3 +1,7 @@ +2014-01-26 Andreas Kirschbaum + + * Save modified plugin scripts. + 2014-01-24 Andreas Kirschbaum * Properly enable/disable Edit|Grow/Shrink Selection menu. Modified: trunk/src/daimonin/ChangeLog =================================================================== --- trunk/src/daimonin/ChangeLog 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/daimonin/ChangeLog 2014-01-26 20:51:52 UTC (rev 9558) @@ -1,3 +1,7 @@ +2014-01-26 Andreas Kirschbaum + + * Save modified plugin scripts. + 2014-01-24 Andreas Kirschbaum * Properly enable/disable Edit|Grow/Shrink Selection menu. Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java =================================================================== --- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java 2014-01-26 20:51:52 UTC (rev 9558) @@ -38,6 +38,7 @@ import net.sf.gridarta.plugin.parameter.PluginParameter; import net.sf.gridarta.plugin.parameter.PluginParameterCodec; import net.sf.gridarta.plugin.parameter.PluginParameterFactory; +import net.sf.gridarta.plugin.parameter.PluginParameterListener; import net.sf.gridarta.plugin.parameter.StringParameter; import org.apache.log4j.Category; import org.apache.log4j.Logger; @@ -124,6 +125,20 @@ private boolean modified; /** + * The {@link PluginParameterListener} that is attached to all {@link + * #parameters plugin parameters} to detect changes. + */ + @NotNull + private final PluginParameterListener pluginParameterListener = new PluginParameterListener() { + + @Override + public void changed() { + setModified(); + } + + }; + + /** * Creates a new instance. * @param name the plugin name * @param pluginParameterFactory the plugin parameter factory for creating @@ -162,8 +177,7 @@ } this.code = code; - modified = true; - notifyListeners(); + setModified(); } /** @@ -212,8 +226,8 @@ return; } parameters.add(pluginParameter); - modified = true; - notifyListeners(); + pluginParameter.addPluginParameterListener(pluginParameterListener); + setModified(); } /** @@ -221,9 +235,8 @@ * @param index the plugin parameter's index */ public void removeParameter(final int index) { - parameters.remove(index); - modified = true; - notifyListeners(); + parameters.remove(index).removePluginParameterListener(pluginParameterListener); + setModified(); } /** @@ -287,8 +300,8 @@ */ public void addParameter(@NotNull final PluginParameter<G, A, R, ?> pluginParameter) { parameters.add(pluginParameter); - modified = true; - notifyListeners(); + pluginParameter.addPluginParameterListener(pluginParameterListener); + setModified(); } /** @@ -340,8 +353,7 @@ return; } this.autoBoot = autoBoot; - modified = true; - notifyListeners(); + setModified(); } /** @@ -353,8 +365,7 @@ return; } this.script = script; - modified = true; - notifyListeners(); + setModified(); } /** @@ -366,8 +377,7 @@ return; } this.filter = filter; - modified = true; - notifyListeners(); + setModified(); } /** @@ -377,9 +387,11 @@ * @throws NoSuchParameterException if the index is invalid */ public void convertType(final int index, @NotNull final String newType) throws NoSuchParameterException { - parameters.set(index, pluginParameterFactory.createParameter(newType, codec.toXML(parameters.get(index)))); - modified = true; - notifyListeners(); + final PluginParameter<G, A, R, ?> newParameter = pluginParameterFactory.createParameter(newType, codec.toXML(parameters.get(index))); + final PluginParameter<G, A, R, ?> oldParameter = parameters.set(index, newParameter); + oldParameter.removePluginParameterListener(pluginParameterListener); + newParameter.addPluginParameterListener(pluginParameterListener); + setModified(); } /** @@ -414,6 +426,14 @@ } /** + * Marks this plugin a modified since last save. + */ + private void setModified() { + modified = true; + notifyListeners(); + } + + /** * Returns the location to save this plugin to. * @return the location to save to, or <code>null</code> if the plugin has * no associated location Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractPluginParameter.java =================================================================== --- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractPluginParameter.java 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractPluginParameter.java 2014-01-26 20:51:52 UTC (rev 9558) @@ -22,6 +22,7 @@ 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.utils.EventListenerList2; import org.jetbrains.annotations.NotNull; /** @@ -31,6 +32,12 @@ public abstract class AbstractPluginParameter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V> implements PluginParameter<G, A, R, V> { /** + * The {@link PluginParameterListener listeners} to notify. + */ + @NotNull + private final EventListenerList2<PluginParameterListener> listeners = new EventListenerList2<PluginParameterListener>(PluginParameterListener.class); + + /** * The name of the parameter for the plugin script. */ @NotNull @@ -51,6 +58,22 @@ /** * {@inheritDoc} */ + @Override + public void addPluginParameterListener(@NotNull final PluginParameterListener listener) { + listeners.add(listener); + } + + /** + * {@inheritDoc} + */ + @Override + public void removePluginParameterListener(@NotNull final PluginParameterListener listener) { + listeners.remove(listener); + } + + /** + * {@inheritDoc} + */ @NotNull @Override public String getName() { @@ -62,7 +85,11 @@ */ @Override public void setName(@NotNull final String name) { + if (this.name.equals(name)) { + return; + } this.name = name; + changed(); } /** @@ -79,7 +106,20 @@ */ @Override public void setDescription(@NotNull final String description) { + if (this.description.equals(description)) { + return; + } this.description = description; + changed(); } + /** + * Notifies all listeners that this plugin parameter has changed. + */ + protected void changed() { + for (final PluginParameterListener listener : listeners.getListeners()) { + listener.changed(); + } + } + } Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractStringPluginParameter.java =================================================================== --- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractStringPluginParameter.java 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractStringPluginParameter.java 2014-01-26 20:51:52 UTC (rev 9558) @@ -60,7 +60,11 @@ */ @Override public boolean setStringValue(@NotNull final String stringValue) { + if (this.stringValue.equals(stringValue)) { + return true; + } this.stringValue = stringValue; + changed(); return true; } Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractValuePluginParameter.java =================================================================== --- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractValuePluginParameter.java 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/AbstractValuePluginParameter.java 2014-01-26 20:51:52 UTC (rev 9558) @@ -59,7 +59,11 @@ * @param value the new value */ public void setValue(@NotNull final V value) { + if (this.value.equals(value)) { + return; + } this.value = value; + changed(); } } Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/BooleanParameter.java =================================================================== --- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/BooleanParameter.java 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/BooleanParameter.java 2014-01-26 20:51:52 UTC (rev 9558) @@ -120,7 +120,11 @@ * @param falseText the string representation */ public void setFalseText(@NotNull final String falseText) { + if (this.falseText.equals(falseText)) { + return; + } this.falseText = falseText; + changed(); } /** @@ -128,7 +132,11 @@ * @param trueText the string representation */ public void setTrueText(@NotNull final String trueText) { + if (this.trueText.equals(trueText)) { + return; + } this.trueText = trueText; + changed(); } } Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/DoubleParameter.java =================================================================== --- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/DoubleParameter.java 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/DoubleParameter.java 2014-01-26 20:51:52 UTC (rev 9558) @@ -125,7 +125,12 @@ * @param max the maximal allowed value */ public void setMax(final double max) { - this.max = Math.max(min, max); + final double newMax = Math.max(min, max); + if (this.max == newMax) { + return; + } + this.max = newMax; + changed(); if (getValue() > this.max) { setValue(this.max); } @@ -144,7 +149,12 @@ * @param min the minimal allowed value */ public void setMin(final double min) { - this.min = Math.min(min, max); + final double newMin = Math.min(min, max); + if (this.min == newMin) { + return; + } + this.min = newMin; + changed(); if (getValue() < this.min) { setValue(this.min); } Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/IntegerParameter.java =================================================================== --- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/IntegerParameter.java 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/IntegerParameter.java 2014-01-26 20:51:52 UTC (rev 9558) @@ -123,7 +123,12 @@ * @param max the maximal allowed value */ public void setMax(final int max) { - this.max = Math.max(min, max); + final int newMax = Math.max(min, max); + if (this.max == newMax) { + return; + } + this.max = newMax; + changed(); if (getValue() > this.max) { setValue(this.max); } @@ -142,7 +147,12 @@ * @param min the minimal allowed value */ public void setMin(final int min) { - this.min = Math.min(min, max); + final int newMin = Math.min(min, max); + if (this.min == newMin) { + return; + } + this.min = newMin; + changed(); if (getValue() < this.min) { setValue(this.min); } Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameter.java =================================================================== --- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameter.java 2014-01-26 20:26:29 UTC (rev 9557) +++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameter.java 2014-01-26 20:51:52 UTC (rev 9558) @@ -33,6 +33,18 @@ public interface PluginParameter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V> { /** + * Adds a {@link PluginParameterListener listener} to be notified. + * @param listener the listener + */ + void addPluginParameterListener(@NotNull PluginParameterListener listener); + + /** + * Removes a {@link PluginParameterListener listener} to be notified. + * @param listener the listener + */ + void removePluginParameterListener(@NotNull PluginParameterListener listener); + + /** * The name of the parameter. It identifies the parameter in the user * interface and from the plugin script code. * @return the name Added: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterListener.java =================================================================== --- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterListener.java (rev 0) +++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterListener.java 2014-01-26 20:51:52 UTC (rev 9558) @@ -0,0 +1,36 @@ +/* + * 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.plugin.parameter; + +import java.util.EventListener; + +/** + * Interface for listeners interested in {@link PluginParameter} related + * events. + * @author Andreas Kirschbaum + */ +public interface PluginParameterListener extends EventListener { + + /** + * A value of the plugin parameter has changed. + */ + void changed(); + +} Property changes on: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterListener.java ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ 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...> - 2014-01-26 20:26:36
|
Revision: 9557 http://sourceforge.net/p/gridarta/code/9557 Author: akirschbaum Date: 2014-01-26 20:26:29 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Simplify code. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java 2014-01-26 20:25:54 UTC (rev 9556) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java 2014-01-26 20:26:29 UTC (rev 9557) @@ -43,36 +43,25 @@ @NotNull private static final Category log = Logger.getLogger(ParameterTypeEditor.class); - @NotNull - private final PluginParameter<G, A, R, ?> parameter; + public ParameterTypeEditor(@NotNull final PluginModel<G, A, R> pluginModel, @NotNull final Plugin<G, A, R> plugin, @NotNull final PluginParameter<G, A, R, ?> parameter) { + super(pluginModel.getTypes()); + setSelectedItem(parameter.getParameterType()); + addItemListener(new ItemListener() { - @NotNull - private final Plugin<G, A, R> plugin; - - @NotNull - private final ItemListener itemListener = new ItemListener() { - - @Override - public void itemStateChanged(@NotNull final ItemEvent e) { - if (e.getStateChange() == ItemEvent.SELECTED) { - if (!parameter.getParameterType().equals(e.getItem())) { - try { - plugin.convertType(parameter, (String) e.getItem()); - } catch (final NoSuchParameterException ex) { - log.warn("Cannot create parameter for type " + e.getItem()); + @Override + public void itemStateChanged(@NotNull final ItemEvent e) { + if (e.getStateChange() == ItemEvent.SELECTED) { + if (!parameter.getParameterType().equals(e.getItem())) { + try { + plugin.convertType(parameter, (String) e.getItem()); + } catch (final NoSuchParameterException ex) { + log.warn("Cannot create parameter for type " + e.getItem()); + } } } } - } - }; - - public ParameterTypeEditor(@NotNull final PluginModel<G, A, R> pluginModel, @NotNull final Plugin<G, A, R> plugin, @NotNull final PluginParameter<G, A, R, ?> parameter) { - super(pluginModel.getTypes()); - this.parameter = parameter; - this.plugin = plugin; - setSelectedItem(parameter.getParameterType()); - addItemListener(itemListener); + }); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:25:56
|
Revision: 9556 http://sourceforge.net/p/gridarta/code/9556 Author: akirschbaum Date: 2014-01-26 20:25:54 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Simplify code. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java 2014-01-26 20:24:58 UTC (rev 9555) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java 2014-01-26 20:25:54 UTC (rev 9556) @@ -32,37 +32,30 @@ private static final long serialVersionUID = 1L; - @NotNull - private final PluginParameter<G, A, R, ?> parameter; + public ParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) { + setText(parameter.getName()); + getDocument().addDocumentListener(new DocumentListener() { - @NotNull - private final DocumentListener documentListener = new DocumentListener() { + @Override + public void insertUpdate(@NotNull final DocumentEvent e) { + change(); + } - @Override - public void insertUpdate(@NotNull final DocumentEvent e) { - change(); - } + @Override + public void removeUpdate(@NotNull final DocumentEvent e) { + change(); + } - @Override - public void removeUpdate(@NotNull final DocumentEvent e) { - change(); - } + @Override + public void changedUpdate(@NotNull final DocumentEvent e) { + change(); + } - @Override - public void changedUpdate(@NotNull final DocumentEvent e) { - change(); - } + private void change() { + parameter.setName(getText()); + } - }; - - public ParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) { - this.parameter = parameter; - setText(parameter.getName()); - getDocument().addDocumentListener(documentListener); + }); } - private void change() { - parameter.setName(getText()); - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:25:02
|
Revision: 9555 http://sourceforge.net/p/gridarta/code/9555 Author: akirschbaum Date: 2014-01-26 20:24:58 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Remove unneeded field. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java 2014-01-26 20:23:58 UTC (rev 9554) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java 2014-01-26 20:24:58 UTC (rev 9555) @@ -32,11 +32,7 @@ private static final long serialVersionUID = 1L; - @NotNull - private final PluginParameter<G, A, R, ?> parameter; - public ParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) { - this.parameter = parameter; setText(parameter.getDescription()); getDocument().addDocumentListener(new DocumentListener() { @@ -56,7 +52,7 @@ } private void change() { - ParameterDescriptionEditor.this.parameter.setDescription(getText()); + parameter.setDescription(getText()); } }); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:24:07
|
Revision: 9554 http://sourceforge.net/p/gridarta/code/9554 Author: akirschbaum Date: 2014-01-26 20:23:58 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Rename parameter name. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java 2014-01-26 20:23:09 UTC (rev 9553) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java 2014-01-26 20:23:58 UTC (rev 9554) @@ -35,9 +35,9 @@ @NotNull private final PluginParameter<G, A, R, ?> parameter; - public ParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> param) { - parameter = param; - setText(param.getDescription()); + public ParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) { + this.parameter = parameter; + setText(parameter.getDescription()); getDocument().addDocumentListener(new DocumentListener() { @Override @@ -56,7 +56,7 @@ } private void change() { - parameter.setDescription(getText()); + ParameterDescriptionEditor.this.parameter.setDescription(getText()); } }); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:23:15
|
Revision: 9553 http://sourceforge.net/p/gridarta/code/9553 Author: akirschbaum Date: 2014-01-26 20:23:09 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Remove synchronization block as this code is always called from the EDT. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java 2014-01-26 20:21:40 UTC (rev 9552) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java 2014-01-26 20:23:09 UTC (rev 9553) @@ -112,7 +112,7 @@ locked = false; } - private synchronized void buildPanel() { + private void buildPanel() { final GridBagConstraints gbc = new GridBagConstraints(); gbc.gridx = 0; gbc.gridy = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:21:43
|
Revision: 9552 http://sourceforge.net/p/gridarta/code/9552 Author: akirschbaum Date: 2014-01-26 20:21:40 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Simplify code. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java 2014-01-26 20:20:48 UTC (rev 9551) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java 2014-01-26 20:21:40 UTC (rev 9552) @@ -113,108 +113,105 @@ } private synchronized void buildPanel() { - if (!built) { - built = true; - final GridBagConstraints gbc = new GridBagConstraints(); - gbc.gridx = 0; - gbc.gridy = 0; - gbc.weightx = 1.0; - gbc.gridwidth = 4; - gbc.fill = GridBagConstraints.HORIZONTAL; - editorPanel.add(editor, gbc); - gbc.gridy = 1; - gbc.gridwidth = 1; - gbc.weightx = 0.0; - gbc.gridx = 1; - final AbstractButton fromSelect = new JButton("From tile selection"); - fromSelect.addActionListener(new ActionListener() { + final GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridx = 0; + gbc.gridy = 0; + gbc.weightx = 1.0; + gbc.gridwidth = 4; + gbc.fill = GridBagConstraints.HORIZONTAL; + editorPanel.add(editor, gbc); + gbc.gridy = 1; + gbc.gridwidth = 1; + gbc.weightx = 0.0; + gbc.gridx = 1; + final AbstractButton fromSelect = new JButton("From tile selection"); + fromSelect.addActionListener(new ActionListener() { - @Override - public void actionPerformed(final ActionEvent e) { - final BaseObject<G, A, R, ?> gameObject = objectChooser.getSelection(); - if (gameObject != null) { - final Archetype<G, A, R> ao = archComboBoxModel.getNearestMatch(gameObject.getArchetype().getArchetypeName()); - archComboBox.setSelectedItem(ao); - setItem(ao); - } + @Override + public void actionPerformed(final ActionEvent e) { + final BaseObject<G, A, R, ?> gameObject = objectChooser.getSelection(); + if (gameObject != null) { + final Archetype<G, A, R> ao = archComboBoxModel.getNearestMatch(gameObject.getArchetype().getArchetypeName()); + archComboBox.setSelectedItem(ao); + setItem(ao); } - }); - editorPanel.add(fromSelect, gbc); - final AbstractButton fromActive = new JButton("From map selection"); - fromActive.addActionListener(new ActionListener() { + } + }); + editorPanel.add(fromSelect, gbc); + final AbstractButton fromActive = new JButton("From map selection"); + fromActive.addActionListener(new ActionListener() { - @Override - public void actionPerformed(final ActionEvent e) { - final BaseObject<G, A, R, ?> gameObject = gameObjectAttributesModel.getSelectedGameObject(); - if (gameObject != null) { - final Archetype<G, A, R> ao = archComboBoxModel.getNearestMatch(gameObject.getArchetype().getArchetypeName()); - archComboBox.setSelectedItem(ao); - setItem(ao); - } + @Override + public void actionPerformed(final ActionEvent e) { + final BaseObject<G, A, R, ?> gameObject = gameObjectAttributesModel.getSelectedGameObject(); + if (gameObject != null) { + final Archetype<G, A, R> ao = archComboBoxModel.getNearestMatch(gameObject.getArchetype().getArchetypeName()); + archComboBox.setSelectedItem(ao); + setItem(ao); } - }); - gbc.gridx = 2; - editorPanel.add(fromActive, gbc); - editor.addMouseListener(new MouseListener() { + } + }); + gbc.gridx = 2; + editorPanel.add(fromActive, gbc); + editor.addMouseListener(new MouseListener() { - @Override - public void mouseClicked(final MouseEvent e) { - } + @Override + public void mouseClicked(final MouseEvent e) { + } - @Override - public void mouseEntered(final MouseEvent e) { - //popup.setLocation(p.x, p.y+archComboBoxEditor.getHeight()+5); - popup.setPreferredSize(null); - final Dimension d = popup.getPreferredSize(); - final Dimension p = editorPanel.getSize(); - if (d.width < p.width) { - d.width = p.width; - } - if (d.height < p.height) { - d.height = p.height; - } - popup.setPreferredSize(d); - popup.show(editorPanel, 0, editorPanel.getHeight() + 5); + @Override + public void mouseEntered(final MouseEvent e) { + //popup.setLocation(p.x, p.y+archComboBoxEditor.getHeight()+5); + popup.setPreferredSize(null); + final Dimension d = popup.getPreferredSize(); + final Dimension p = editorPanel.getSize(); + if (d.width < p.width) { + d.width = p.width; } - - @Override - public void mouseExited(final MouseEvent e) { - popup.setVisible(false); + if (d.height < p.height) { + d.height = p.height; } + popup.setPreferredSize(d); + popup.show(editorPanel, 0, editorPanel.getHeight() + 5); + } - @Override - public void mousePressed(final MouseEvent e) { - } + @Override + public void mouseExited(final MouseEvent e) { + popup.setVisible(false); + } - @Override - public void mouseReleased(final MouseEvent e) { - } - }); - editor.setEditable(true); - editor.getDocument().addDocumentListener(new DocumentListener() { + @Override + public void mousePressed(final MouseEvent e) { + } - @Override - public void changedUpdate(final DocumentEvent e) { - archComboBox.editorEntryChange(); - } + @Override + public void mouseReleased(final MouseEvent e) { + } + }); + editor.setEditable(true); + editor.getDocument().addDocumentListener(new DocumentListener() { - @Override - public void insertUpdate(final DocumentEvent e) { - archComboBox.editorEntryChange(); - } + @Override + public void changedUpdate(final DocumentEvent e) { + archComboBox.editorEntryChange(); + } - @Override - public void removeUpdate(final DocumentEvent e) { - archComboBox.editorEntryChange(); - } - }); - popup.setLayout(new FlowLayout()); - popup.setBackground(CommonConstants.BG_COLOR); - popup.setBorder(new LineBorder(Color.black)); - popup.add(icon); - popup.setFocusable(false); - archComboBox.setBackground(CommonConstants.BG_COLOR); - } + @Override + public void insertUpdate(final DocumentEvent e) { + archComboBox.editorEntryChange(); + } + + @Override + public void removeUpdate(final DocumentEvent e) { + archComboBox.editorEntryChange(); + } + }); + popup.setLayout(new FlowLayout()); + popup.setBackground(CommonConstants.BG_COLOR); + popup.setBorder(new LineBorder(Color.black)); + popup.add(icon); + popup.setFocusable(false); + archComboBox.setBackground(CommonConstants.BG_COLOR); } @Override @@ -226,7 +223,10 @@ @NotNull @Override public Component getEditorComponent() { - buildPanel(); + if (!built) { + buildPanel(); + built = true; + } return editorPanel; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:20:54
|
Revision: 9551 http://sourceforge.net/p/gridarta/code/9551 Author: akirschbaum Date: 2014-01-26 20:20:48 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Make fields final. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java 2014-01-26 20:17:13 UTC (rev 9550) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java 2014-01-26 20:20:48 UTC (rev 9551) @@ -66,18 +66,23 @@ @NotNull private final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel; - @Nullable - private Container editorPanel; + /** + * Whether the GUI has been built. + */ + private boolean built; - @Nullable - private JLabel icon; + @NotNull + private final Container editorPanel = new JPanel(new GridBagLayout()); - @Nullable - private JTextComponent editor; + @NotNull + private final JLabel icon = new JLabel(); - @Nullable - private JPopupMenu popup; + @NotNull + private final JTextComponent editor = new JTextField(); + @NotNull + private final JPopupMenu popup = new JPopupMenu(); + private volatile boolean locked; /** @@ -108,15 +113,14 @@ } private synchronized void buildPanel() { - if (editorPanel == null) { - editorPanel = new JPanel(new GridBagLayout()); + if (!built) { + built = true; final GridBagConstraints gbc = new GridBagConstraints(); gbc.gridx = 0; gbc.gridy = 0; gbc.weightx = 1.0; gbc.gridwidth = 4; gbc.fill = GridBagConstraints.HORIZONTAL; - editor = new JTextField(); editorPanel.add(editor, gbc); gbc.gridy = 1; gbc.gridwidth = 1; @@ -204,8 +208,6 @@ archComboBox.editorEntryChange(); } }); - icon = new JLabel(); - popup = new JPopupMenu(); popup.setLayout(new FlowLayout()); popup.setBackground(CommonConstants.BG_COLOR); popup.setBorder(new LineBorder(Color.black)); @@ -224,9 +226,7 @@ @NotNull @Override public Component getEditorComponent() { - if (editorPanel == null) { - buildPanel(); - } + buildPanel(); return editorPanel; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:17:17
|
Revision: 9550 http://sourceforge.net/p/gridarta/code/9550 Author: akirschbaum Date: 2014-01-26 20:17:13 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Add nullable annotations. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/TooltipSpinner.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java 2014-01-26 20:07:03 UTC (rev 9549) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java 2014-01-26 20:17:13 UTC (rev 9550) @@ -38,12 +38,15 @@ /** * The Logger for printing log messages. */ + @NotNull private static final Category log = Logger.getLogger(ArchComboBox.class); private static final long serialVersionUID = 1L; + @NotNull private final ArchComboBoxEditor<G, A, R> archComboBoxEditor; + @NotNull private final ArchComboBoxModel<G, A, R> archComboBoxModel; /** Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java 2014-01-26 20:07:03 UTC (rev 9549) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java 2014-01-26 20:17:13 UTC (rev 9550) @@ -26,9 +26,11 @@ import net.sf.gridarta.model.baseobject.BaseObject; import net.sf.gridarta.model.face.FaceObjectProviders; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class ArchComboBoxCellRenderer extends DefaultListCellRenderer { + @NotNull private static final String SIZE_TESTER = "**SizeTester**"; private static final long serialVersionUID = 1L; @@ -57,8 +59,9 @@ * reconfigure the label each time we're called. */ + @NotNull @Override - public Component getListCellRendererComponent(final JList list, final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) { + public Component getListCellRendererComponent(@NotNull final JList list, @Nullable final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) { if (SIZE_TESTER.equals(value)) { return archComboBoxEditor.getEditorComponent(); } Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java 2014-01-26 20:07:03 UTC (rev 9549) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java 2014-01-26 20:17:13 UTC (rev 9550) @@ -54,20 +54,28 @@ public class ArchComboBoxEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements ComboBoxEditor { + @NotNull private final ArchComboBox<G, A, R> archComboBox; + @NotNull private final ArchComboBoxModel<G, A, R> archComboBoxModel; + @NotNull private final ObjectChooser<G, A, R> objectChooser; + @NotNull private final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel; + @Nullable private Container editorPanel; + @Nullable private JLabel icon; + @Nullable private JTextComponent editor; + @Nullable private JPopupMenu popup; private volatile boolean locked; @@ -83,7 +91,7 @@ * @param faceObjectProviders the face object providers for looking up * faces */ - public ArchComboBoxEditor(final ArchComboBox<G, A, R> archComboBox, final ArchComboBoxModel<G, A, R> archComboBoxModel, final ObjectChooser<G, A, R> objectChooser, final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final FaceObjectProviders faceObjectProviders) { + public ArchComboBoxEditor(@NotNull final ArchComboBox<G, A, R> archComboBox, @NotNull final ArchComboBoxModel<G, A, R> archComboBoxModel, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final FaceObjectProviders faceObjectProviders) { this.archComboBox = archComboBox; this.archComboBoxModel = archComboBoxModel; this.objectChooser = objectChooser; @@ -213,6 +221,7 @@ } + @NotNull @Override public Component getEditorComponent() { if (editorPanel == null) { @@ -222,13 +231,13 @@ } @Override - public void addActionListener(final ActionListener l) { + public void addActionListener(@NotNull final ActionListener l) { // TODO Auto-generated method stub } @Override - public void removeActionListener(final ActionListener l) { + public void removeActionListener(@NotNull final ActionListener l) { // TODO Auto-generated method stub } @@ -241,7 +250,7 @@ } @Override - public void setItem(final Object anObject) { + public void setItem(@Nullable final Object anObject) { final BaseObject<?, ?, ?, ?> arch = (BaseObject<?, ?, ?, ?>) anObject; if (anObject == null) { icon.setIcon(null); @@ -263,6 +272,7 @@ } } + @Nullable public JTextComponent getEditor() { return editor; } Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java 2014-01-26 20:07:03 UTC (rev 9549) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java 2014-01-26 20:17:13 UTC (rev 9550) @@ -67,7 +67,7 @@ } @Override - public void setSelectedItem(final Object anItem) { + public void setSelectedItem(@Nullable final Object anItem) { value = anItem; } Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java 2014-01-26 20:07:03 UTC (rev 9549) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java 2014-01-26 20:17:13 UTC (rev 9550) @@ -25,6 +25,7 @@ import net.sf.gridarta.model.mapcontrol.MapControl; import net.sf.gridarta.model.mapmanager.MapManager; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class MapParameterCellRenderer extends DefaultListCellRenderer { @@ -51,7 +52,7 @@ * {@inheritDoc} */ @Override - public Component getListCellRendererComponent(final JList list, final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) { + public Component getListCellRendererComponent(@NotNull final JList list, @Nullable final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) { final String newVal; if (value instanceof MapControl) { newVal = ((MapControl<?, ?, ?>) value).getMapModel().getMapArchObject().getMapName(); Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java 2014-01-26 20:07:03 UTC (rev 9549) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java 2014-01-26 20:17:13 UTC (rev 9550) @@ -27,11 +27,14 @@ import net.sf.gridarta.model.mapcontrol.MapControl; import net.sf.gridarta.model.mapmanager.MapManager; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class MapParameterComboBoxModel<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends DefaultComboBoxModel { + @NotNull private final Object currentMap = new Object(); + @Nullable private Object selected; private static final long serialVersionUID = 1L; @@ -53,6 +56,7 @@ /** * {@inheritDoc} */ + @NotNull @Override public Object getElementAt(final int index) { if (index == 0) { @@ -66,7 +70,7 @@ * {@inheritDoc} */ @Override - public int getIndexOf(final Object anObject) { + public int getIndexOf(@NotNull final Object anObject) { final List<MapControl<G, A, R>> maps = mapManager.getOpenedMaps(); if (anObject == currentMap) { return 0; @@ -84,6 +88,7 @@ /** * {@inheritDoc} */ + @Nullable @Override public Object getSelectedItem() { return selected; @@ -101,7 +106,7 @@ * {@inheritDoc} */ @Override - public void setSelectedItem(final Object anObject) { + public void setSelectedItem(@Nullable final Object anObject) { selected = anObject; } Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java 2014-01-26 20:07:03 UTC (rev 9549) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java 2014-01-26 20:17:13 UTC (rev 9550) @@ -26,30 +26,32 @@ import net.sf.gridarta.model.gameobject.GameObject; import net.sf.gridarta.model.maparchobject.MapArchObject; import net.sf.gridarta.plugin.parameter.PluginParameter; +import org.jetbrains.annotations.NotNull; public class ParameterDescriptionEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JTextField { private static final long serialVersionUID = 1L; + @NotNull private final PluginParameter<G, A, R, ?> parameter; - public ParameterDescriptionEditor(final PluginParameter<G, A, R, ?> param) { + public ParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> param) { parameter = param; setText(param.getDescription()); getDocument().addDocumentListener(new DocumentListener() { @Override - public void changedUpdate(final DocumentEvent e) { + public void changedUpdate(@NotNull final DocumentEvent e) { change(); } @Override - public void insertUpdate(final DocumentEvent e) { + public void insertUpdate(@NotNull final DocumentEvent e) { change(); } @Override - public void removeUpdate(final DocumentEvent e) { + public void removeUpdate(@NotNull final DocumentEvent e) { change(); } Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java 2014-01-26 20:07:03 UTC (rev 9549) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java 2014-01-26 20:17:13 UTC (rev 9550) @@ -26,33 +26,36 @@ import net.sf.gridarta.model.gameobject.GameObject; import net.sf.gridarta.model.maparchobject.MapArchObject; import net.sf.gridarta.plugin.parameter.PluginParameter; +import org.jetbrains.annotations.NotNull; public class ParameterNameEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JTextField { private static final long serialVersionUID = 1L; + @NotNull private final PluginParameter<G, A, R, ?> parameter; + @NotNull private final DocumentListener documentListener = new DocumentListener() { @Override - public void insertUpdate(final DocumentEvent e) { + public void insertUpdate(@NotNull final DocumentEvent e) { change(); } @Override - public void removeUpdate(final DocumentEvent e) { + public void removeUpdate(@NotNull final DocumentEvent e) { change(); } @Override - public void changedUpdate(final DocumentEvent e) { + public void changedUpdate(@NotNull final DocumentEvent e) { change(); } }; - public ParameterNameEditor(final PluginParameter<G, A, R, ?> parameter) { + public ParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> parameter) { this.parameter = parameter; setText(parameter.getName()); getDocument().addDocumentListener(documentListener); Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/TooltipSpinner.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/TooltipSpinner.java 2014-01-26 20:07:03 UTC (rev 9549) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/TooltipSpinner.java 2014-01-26 20:17:13 UTC (rev 9550) @@ -23,6 +23,7 @@ import javax.swing.JComponent; import javax.swing.JSpinner; import javax.swing.SpinnerModel; +import org.jetbrains.annotations.NotNull; /** * Extends JSpinner to work around it's tooltip bug This bug has been fixed @@ -33,7 +34,7 @@ private static final long serialVersionUID = -797350272052837471L; - public TooltipSpinner(final SpinnerModel model) { + public TooltipSpinner(@NotNull final SpinnerModel model) { super(model); } @@ -43,11 +44,11 @@ * @param text the tooltip to show */ @Override - public void setToolTipText(final String text) { + public void setToolTipText(@NotNull final String text) { forceTooltip(this, text); } - private void forceTooltip(final JComponent tooltipComponent, final String tooltip) { + private void forceTooltip(@NotNull final JComponent tooltipComponent, @NotNull final String tooltip) { if (tooltipComponent == this) { super.setToolTipText(tooltip); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:07:08
|
Revision: 9549 http://sourceforge.net/p/gridarta/code/9549 Author: akirschbaum Date: 2014-01-26 20:07:03 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Add nullable annotations. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-01-26 20:04:44 UTC (rev 9548) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-01-26 20:07:03 UTC (rev 9549) @@ -342,6 +342,7 @@ c.addMouseListener(cellMouseListener); } + @NotNull private Component getParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> param) { final Component existingParameterNameEditor = paramNameEditors.get(param); if (existingParameterNameEditor != null) { @@ -354,6 +355,7 @@ return newParameterNameEditor; } + @NotNull private Component getParameterDescriptionEditor(@NotNull final PluginParameter<G, A, R, ?> param) { final Component existingParameterDescriptionEditor = paramDescriptionEditors.get(param); if (existingParameterDescriptionEditor != null) { @@ -366,6 +368,7 @@ return newParameterDescriptionEditor; } + @NotNull private Component getParameterTypeEditor(@NotNull final PluginParameter<G, A, R, ?> param) { final Component existingParameterTypeEditor = paramTypeEditors.get(param); if (existingParameterTypeEditor != null) { @@ -378,6 +381,7 @@ return newParameterTypeEditor; } + @NotNull private PluginParameterView<G, A, R> getParameterView(@NotNull final PluginParameter<G, A, R, ?> param) { final PluginParameterView<G, A, R> existingPluginParameterView = paramViews.get(param); if (existingPluginParameterView != null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 20:04:50
|
Revision: 9548 http://sourceforge.net/p/gridarta/code/9548 Author: akirschbaum Date: 2014-01-26 20:04:44 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Remove unneeded debug messages. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-01-26 19:49:14 UTC (rev 9547) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2014-01-26 20:04:44 UTC (rev 9548) @@ -62,8 +62,6 @@ import net.sf.japi.swing.action.ActionBuilder; import net.sf.japi.swing.action.ActionBuilderFactory; import net.sf.japi.swing.action.ActionMethod; -import org.apache.log4j.Category; -import org.apache.log4j.Logger; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; import org.fife.ui.rtextarea.RTextScrollPane; @@ -72,12 +70,6 @@ public class PluginEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> { /** - * The Logger for printing log messages. - */ - @NotNull - private static final Category log = Logger.getLogger(PluginEditor.class); - - /** * Action Builder. */ @NotNull @@ -351,10 +343,6 @@ } private Component getParameterNameEditor(@NotNull final PluginParameter<G, A, R, ?> param) { - if (log.isDebugEnabled()) { - log.debug("Doing " + param); - } - final Component existingParameterNameEditor = paramNameEditors.get(param); if (existingParameterNameEditor != null) { return existingParameterNameEditor; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 19:49:22
|
Revision: 9547 http://sourceforge.net/p/gridarta/code/9547 Author: akirschbaum Date: 2014-01-26 19:49:14 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Move hard-coded default values of 'External Applications' in settings dialog into properties file. Modified Paths: -------------- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages.properties trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java trunk/src/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/messages.properties trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/messages.properties trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/EditorFactory.java trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java =================================================================== --- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2014-01-26 19:31:34 UTC (rev 9546) +++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2014-01-26 19:49:14 UTC (rev 9547) @@ -413,15 +413,6 @@ */ @NotNull @Override - public AppPreferencesModel createAppPreferencesModel() { - return new AppPreferencesModel("../server/atrinik_server", System.getProperty("os.name").toLowerCase().startsWith("win") ? "../client/atrinik.exe" : "../client-1.1.1/atrinik-client", "vim"); - } - - /** - * {@inheritDoc} - */ - @NotNull - @Override public MapPropertiesDialogFactory<GameObject, MapArchObject, Archetype> newMapPropertiesDialogFactory(@NotNull final ProjectSettings projectSettings, @NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapPathNormalizer mapPathNormalizer) { return new DefaultMapPropertiesDialogFactory(mapManager, projectSettings, mapPathNormalizer); } Modified: trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages.properties =================================================================== --- trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages.properties 2014-01-26 19:31:34 UTC (rev 9546) +++ trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/messages.properties 2014-01-26 19:49:14 UTC (rev 9547) @@ -177,3 +177,11 @@ 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} + + +############################################################### +# Default settings for External Applications in Settings dialog +serverDefault=../server/atrinik_server +clientDefaultWindows=../client/atrinik.exe +clientDefaultOther=../client-1.1.1/atrinik-client +editorDefault=vim Modified: trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java =================================================================== --- trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2014-01-26 19:31:34 UTC (rev 9546) +++ trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2014-01-26 19:49:14 UTC (rev 9547) @@ -304,15 +304,6 @@ */ @NotNull @Override - public AppPreferencesModel createAppPreferencesModel() { - return new AppPreferencesModel("crossfire-server", System.getProperty("os.name").toLowerCase().startsWith("win") ? "GTKClient.exe" : "crossfire-client-gtk2", "vim"); - } - - /** - * {@inheritDoc} - */ - @NotNull - @Override public MapPropertiesDialogFactory<GameObject, MapArchObject, Archetype> newMapPropertiesDialogFactory(@NotNull final ProjectSettings projectSettings, @NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapPathNormalizer mapPathNormalizer) { return new DefaultMapPropertiesDialogFactory(mapManager, projectSettings, mapPathNormalizer); } Modified: trunk/src/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/messages.properties =================================================================== --- trunk/src/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/messages.properties 2014-01-26 19:31:34 UTC (rev 9546) +++ trunk/src/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/messages.properties 2014-01-26 19:49:14 UTC (rev 9547) @@ -154,3 +154,11 @@ validator.8=net.sf.gridarta.model.validation.checks.UndefinedArchetypeChecker validator.9=net.sf.gridarta.model.validation.checks.UnsetSlayingChecker 20,21,51,52,55,64,122 player validator.10=net.sf.gridarta.model.validation.checks.CustomTypeChecker 0,71 0,77 + + +############################################################### +# Default settings for External Applications in Settings dialog +serverDefault=crossfire-server +clientDefaultWindows=GTKClient.exe +clientDefaultOther=crossfire-client-gtk2 +editorDefault=vim Modified: trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java =================================================================== --- trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2014-01-26 19:31:34 UTC (rev 9546) +++ trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2014-01-26 19:49:14 UTC (rev 9547) @@ -412,15 +412,6 @@ */ @NotNull @Override - public AppPreferencesModel createAppPreferencesModel() { - return new AppPreferencesModel("../server/daimonin_server", System.getProperty("os.name").toLowerCase().startsWith("win") ? "../client/Daimonin.exe" : "../client-BETA3-0.966/daimonin", "vim"); - } - - /** - * {@inheritDoc} - */ - @NotNull - @Override public MapPropertiesDialogFactory<GameObject, MapArchObject, Archetype> newMapPropertiesDialogFactory(@NotNull final ProjectSettings projectSettings, @NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapPathNormalizer mapPathNormalizer) { return new DefaultMapPropertiesDialogFactory(mapManager, projectSettings, mapPathNormalizer); } Modified: trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/messages.properties =================================================================== --- trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/messages.properties 2014-01-26 19:31:34 UTC (rev 9546) +++ trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/messages.properties 2014-01-26 19:49:14 UTC (rev 9547) @@ -182,3 +182,11 @@ validator.17=net.sf.gridarta.model.validation.checks.UnsetSlayingChecker 20,21,51,55,64,122 validator.18=net.sf.gridarta.model.validation.checks.CustomTypeChecker 80,83,81 validator.19=net.sf.gridarta.model.validation.checks.SlayingChecker ^[a-zA-Z_0-9/.]*$ system_environment_sensor,|([0-1][0-9]|2[0-3]):[0-5][0-9]-([0-1][0-9]|2[0-3]):[0-5][0-9] + + +############################################################### +# Default settings for External Applications in Settings dialog +serverDefault=../server/daimonin_server +clientDefaultWindows=../client/Daimonin.exe +clientDefaultOther=../client-BETA3-0.966/daimonin +editorDefault=vim Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/EditorFactory.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/EditorFactory.java 2014-01-26 19:31:34 UTC (rev 9546) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/EditorFactory.java 2014-01-26 19:49:14 UTC (rev 9547) @@ -141,13 +141,6 @@ MapViewFactory<G, A, R> newMapViewFactory(@NotNull RendererFactory<G, A, R> rendererFactory, @NotNull PathManager pathManager); /** - * Creates a new {@link AppPreferencesModel} instance. - * @return the new instance - */ - @NotNull - AppPreferencesModel createAppPreferencesModel(); - - /** * Creates a new {@link MapPropertiesDialogFactory} instance. * @param projectSettings the project settings to use * @param mapManager the map manager to use Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java 2014-01-26 19:31:34 UTC (rev 9546) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java 2014-01-26 19:49:14 UTC (rev 9547) @@ -203,6 +203,7 @@ import net.sf.gridarta.textedit.scripteditor.ScriptEditControl; import net.sf.gridarta.textedit.textarea.TextAreaDefaults; import net.sf.gridarta.updater.UpdaterManager; +import net.sf.gridarta.utils.ActionBuilderUtils; import net.sf.gridarta.utils.ActionUtils; import net.sf.gridarta.utils.EditorAction; import net.sf.gridarta.utils.Exiter; @@ -323,7 +324,7 @@ final ImageCreator2<G, A, R> imageCreator2 = new ImageCreator2<G, A, R>(volatileSettings, imageCreator); final String spellFile = editorFactory.getSpellFile(); final SpellsUtils spellUtils = spellFile != null ? new SpellsUtils(spellFile) : null; - final AppPreferencesModel appPreferencesModel = editorFactory.createAppPreferencesModel(); + final AppPreferencesModel appPreferencesModel = new AppPreferencesModel(ActionBuilderUtils.getString(ACTION_BUILDER, "serverDefault"), System.getProperty("os.name").toLowerCase().startsWith("win") ? ActionBuilderUtils.getString(ACTION_BUILDER, "clientDefaultWindows") : ActionBuilderUtils.getString(ACTION_BUILDER, "clientDefaultOther"), ActionBuilderUtils.getString(ACTION_BUILDER, "editorDefault")); final MapViewManager<G, A, R> mapViewManager = new MapViewManager<G, A, R>(); final StatusBar<G, A, R> statusBar = new StatusBar<G, A, R>(projectModel.getMapManager(), mapViewManager, projectModel.getArchetypeSet(), projectModel.getFaceObjects()); final MapImageCache<G, A, R> mapImageCache = new MapImageCache<G, A, R>(projectModel.getMapManager(), resourceIcons.getResourceIcon(ResourceIcons.DEFAULT_ICON).getImage(), resourceIcons.getResourceIcon(ResourceIcons.DEFAULT_PREVIEW).getImage(), rendererFactory, editorFactory.getCacheFiles()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 19:31:40
|
Revision: 9546 http://sourceforge.net/p/gridarta/code/9546 Author: akirschbaum Date: 2014-01-26 19:31:34 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Fix incorrect path names. Modified Paths: -------------- trunk/gridarta.ipr Modified: trunk/gridarta.ipr =================================================================== --- trunk/gridarta.ipr 2014-01-26 19:27:03 UTC (rev 9545) +++ trunk/gridarta.ipr 2014-01-26 19:31:34 UTC (rev 9546) @@ -2295,7 +2295,7 @@ <component name="libraryTable"> <library name="annotations"> <CLASSES> - <root url="jar://$PROJECT_DIR$/rep/annotations/0.0/annotations-0.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/annotations/0.0/annotations-0.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -2358,7 +2358,7 @@ </library> <library name="japi-lib-swing-prefs"> <CLASSES> - <root url="jar://$PROJECT_DIR$/repo/japi-lib-swing-prefs/0.1.0/japi-lib-swing-prefs-0.1.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-prefs/0.1.0/japi-lib-swing-prefs-0.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -2414,7 +2414,7 @@ </library> <library name="rsyntaxtextarea"> <CLASSES> - <root url="jar://$PROJECT_DIR$/../gridarta.tmprepo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 19:27:09
|
Revision: 9545 http://sourceforge.net/p/gridarta/code/9545 Author: akirschbaum Date: 2014-01-26 19:27:03 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Rename japi.jar-LICENSE to japi-lib.jar-LICENSE. Modified Paths: -------------- trunk/build.xml trunk/src/atrinik/build.gradle trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties trunk/src/crossfire/build.gradle trunk/src/daimonin/build.gradle trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties Added Paths: ----------- trunk/repo/japi-lib/japi-lib.jar-LICENSE Removed Paths: ------------- trunk/repo/japi-lib/japi.jar-LICENSE Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2014-01-26 19:23:54 UTC (rev 9544) +++ trunk/build.xml 2014-01-26 19:27:03 UTC (rev 9545) @@ -208,7 +208,7 @@ <fileset dir="${build.dir}" includes="build.properties"/> <fileset file="COPYING"/> <fileset file="repo/bsh/bsh-LICENSE"/> - <fileset file="repo/japi-lib/japi.jar-LICENSE"/> + <fileset file="repo/japi-lib/japi-lib.jar-LICENSE"/> <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/> <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/> <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/> @@ -243,7 +243,7 @@ <fileset dir="${build.dir}" includes="build.properties"/> <fileset file="COPYING"/> <fileset file="repo/bsh/bsh-LICENSE"/> - <fileset file="repo/japi-lib/japi.jar-LICENSE"/> + <fileset file="repo/japi-lib/japi-lib.jar-LICENSE"/> <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/> <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/> <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/> @@ -278,7 +278,7 @@ <fileset dir="${build.dir}" includes="build.properties"/> <fileset file="COPYING"/> <fileset file="repo/bsh/bsh-LICENSE"/> - <fileset file="repo/japi-lib/japi.jar-LICENSE"/> + <fileset file="repo/japi-lib/japi-lib.jar-LICENSE"/> <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/> <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/> <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/> Copied: trunk/repo/japi-lib/japi-lib.jar-LICENSE (from rev 9543, trunk/repo/japi-lib/japi.jar-LICENSE) =================================================================== --- trunk/repo/japi-lib/japi-lib.jar-LICENSE (rev 0) +++ trunk/repo/japi-lib/japi-lib.jar-LICENSE 2014-01-26 19:27:03 UTC (rev 9545) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Deleted: trunk/repo/japi-lib/japi.jar-LICENSE =================================================================== --- trunk/repo/japi-lib/japi.jar-LICENSE 2014-01-26 19:23:54 UTC (rev 9544) +++ trunk/repo/japi-lib/japi.jar-LICENSE 2014-01-26 19:27:03 UTC (rev 9545) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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 St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Modified: trunk/src/atrinik/build.gradle =================================================================== --- trunk/src/atrinik/build.gradle 2014-01-26 19:23:54 UTC (rev 9544) +++ trunk/src/atrinik/build.gradle 2014-01-26 19:27:03 UTC (rev 9545) @@ -28,7 +28,7 @@ manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif' from sourceSets.main.output from new File(rootDir, 'repo/bsh/bsh-LICENSE') - from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE') + from new File(rootDir, 'repo/japi-lib/japi-lib.jar-LICENSE') from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE') from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE') from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE') Modified: trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties =================================================================== --- trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties 2014-01-26 19:23:54 UTC (rev 9544) +++ trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties 2014-01-26 19:27:03 UTC (rev 9545) @@ -62,7 +62,7 @@ license.1.file=License -license.2.file=japi.jar-LICENSE +license.2.file=japi-lib.jar-LICENSE license.3.file=jlfgr-1.0.jar-LICENSE license.4.file=log4j-1.2.13.jar-LICENSE Modified: trunk/src/crossfire/build.gradle =================================================================== --- trunk/src/crossfire/build.gradle 2014-01-26 19:23:54 UTC (rev 9544) +++ trunk/src/crossfire/build.gradle 2014-01-26 19:27:03 UTC (rev 9545) @@ -28,7 +28,7 @@ manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif' from sourceSets.main.output from new File(rootDir, 'repo/bsh/bsh-LICENSE') - from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE') + from new File(rootDir, 'repo/japi-lib/japi-lib.jar-LICENSE') from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE') from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE') from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE') Modified: trunk/src/daimonin/build.gradle =================================================================== --- trunk/src/daimonin/build.gradle 2014-01-26 19:23:54 UTC (rev 9544) +++ trunk/src/daimonin/build.gradle 2014-01-26 19:27:03 UTC (rev 9545) @@ -28,7 +28,7 @@ manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif' from sourceSets.main.output from new File(rootDir, 'repo/bsh/bsh-LICENSE') - from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE') + from new File(rootDir, 'repo/japi-lib/japi-lib.jar-LICENSE') from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE') from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE') from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE') Modified: trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties =================================================================== --- trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties 2014-01-26 19:23:54 UTC (rev 9544) +++ trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties 2014-01-26 19:27:03 UTC (rev 9545) @@ -62,7 +62,7 @@ license.1.file=License -license.2.file=japi.jar-LICENSE +license.2.file=japi-lib.jar-LICENSE license.3.file=jlfgr-1.0.jar-LICENSE license.4.file=log4j-1.2.13.jar-LICENSE Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties =================================================================== --- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-26 19:23:54 UTC (rev 9544) +++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-26 19:27:03 UTC (rev 9545) @@ -978,7 +978,7 @@ license.1.title=Gridarta license.1.file=COPYING license.2.title=JAPI -license.2.file=japi.jar-LICENSE +license.2.file=japi-lib.jar-LICENSE license.3.title=SUN Icons license.3.file=jlfgr-1.0.jar-LICENSE license.4.title=BeanShell This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 19:24:01
|
Revision: 9544 http://sourceforge.net/p/gridarta/code/9544 Author: akirschbaum Date: 2014-01-26 19:23:54 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Properly display license text in About dialog. Modified Paths: -------------- trunk/build.xml trunk/src/atrinik/build.gradle trunk/src/crossfire/build.gradle trunk/src/daimonin/build.gradle Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2014-01-26 18:41:23 UTC (rev 9543) +++ trunk/build.xml 2014-01-26 19:23:54 UTC (rev 9544) @@ -207,13 +207,11 @@ <fileset dir="${build.dir}/utils/app"/> <fileset dir="${build.dir}" includes="build.properties"/> <fileset file="COPYING"/> - <fileset dir="src/atrinik/lib"> - <include name="*-LICENSE"/> - </fileset> <fileset file="repo/bsh/bsh-LICENSE"/> <fileset file="repo/japi-lib/japi.jar-LICENSE"/> <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/> <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/> + <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/> <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/> <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/> <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/> @@ -244,13 +242,11 @@ <fileset dir="${build.dir}/utils/app"/> <fileset dir="${build.dir}" includes="build.properties"/> <fileset file="COPYING"/> - <fileset dir="src/crossfire/lib"> - <include name="*-LICENSE"/> - </fileset> <fileset file="repo/bsh/bsh-LICENSE"/> <fileset file="repo/japi-lib/japi.jar-LICENSE"/> <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/> <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/> + <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/> <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/> <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/> <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/> @@ -281,13 +277,11 @@ <fileset dir="${build.dir}/utils/app"/> <fileset dir="${build.dir}" includes="build.properties"/> <fileset file="COPYING"/> - <fileset dir="src/daimonin/lib"> - <include name="*-LICENSE"/> - </fileset> <fileset file="repo/bsh/bsh-LICENSE"/> <fileset file="repo/japi-lib/japi.jar-LICENSE"/> <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/> <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/> + <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/> <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/> <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/> <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/> Modified: trunk/src/atrinik/build.gradle =================================================================== --- trunk/src/atrinik/build.gradle 2014-01-26 18:41:23 UTC (rev 9543) +++ trunk/src/atrinik/build.gradle 2014-01-26 19:23:54 UTC (rev 9544) @@ -27,6 +27,13 @@ manifest.attributes 'Main-Class': mainClassName manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif' from sourceSets.main.output + from new File(rootDir, 'repo/bsh/bsh-LICENSE') + from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE') + from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE') + from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE') + from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE') + from new File(rootDir, 'repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE') + from new File(rootDir, 'repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE') doFirst { // The following must be executed in doFirst since the configuration // has not been initialized at configuration time. Modified: trunk/src/crossfire/build.gradle =================================================================== --- trunk/src/crossfire/build.gradle 2014-01-26 18:41:23 UTC (rev 9543) +++ trunk/src/crossfire/build.gradle 2014-01-26 19:23:54 UTC (rev 9544) @@ -27,6 +27,13 @@ manifest.attributes 'Main-Class': mainClassName manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif' from sourceSets.main.output + from new File(rootDir, 'repo/bsh/bsh-LICENSE') + from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE') + from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE') + from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE') + from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE') + from new File(rootDir, 'repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE') + from new File(rootDir, 'repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE') doFirst { // The following must be executed in doFirst since the configuration // has not been initialized at configuration time. Modified: trunk/src/daimonin/build.gradle =================================================================== --- trunk/src/daimonin/build.gradle 2014-01-26 18:41:23 UTC (rev 9543) +++ trunk/src/daimonin/build.gradle 2014-01-26 19:23:54 UTC (rev 9544) @@ -27,6 +27,13 @@ manifest.attributes 'Main-Class': mainClassName manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif' from sourceSets.main.output + from new File(rootDir, 'repo/bsh/bsh-LICENSE') + from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE') + from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE') + from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE') + from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE') + from new File(rootDir, 'repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE') + from new File(rootDir, 'repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE') doFirst { // The following must be executed in doFirst since the configuration // has not been initialized at configuration time. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 18:41:30
|
Revision: 9543 http://sourceforge.net/p/gridarta/code/9543 Author: akirschbaum Date: 2014-01-26 18:41:23 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Move jlfgr to repository. Modified Paths: -------------- trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties Added Paths: ----------- trunk/repo/jlfgr/ trunk/repo/jlfgr/1.0/ trunk/repo/jlfgr/1.0/jlfgr-1.0.jar trunk/repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE Removed Paths: ------------- trunk/src/atrinik/lib/ trunk/src/crossfire/lib/ trunk/src/daimonin/lib/ Copied: trunk/repo/jlfgr/1.0/jlfgr-1.0.jar (from rev 9542, trunk/src/daimonin/lib/jlfgr-1_0.jar) =================================================================== (Binary files differ) Copied: trunk/repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE (from rev 9542, trunk/src/daimonin/lib/jlfgr-1_0.jar-LICENSE) =================================================================== --- trunk/repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE (rev 0) +++ trunk/repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE 2014-01-26 18:41:23 UTC (rev 9543) @@ -0,0 +1,10 @@ +Copyright 2000 by Sun Microsystems, Inc. All Rights Reserved. + +Sun grants you ("Licensee") a non-exclusive, royalty free, license to use, and redistribute this software graphics artwork, as individual graphics or as a collection, as part of software code or programs that you develop, provided that i) this copyright notice and license accompany the software graphics artwork; and ii) you do not utilize the software graphics artwork in a manner which is disparaging to Sun. Unless enforcement is prohibited by applicable law, you may not modify the graphics, and must use them true to color and unmodified in every way. + +This software graphics artwork is provided "AS IS," without a warranty of any kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE GRAPHICS ARTWORK. + +IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE GRAPHICS ARTWORK, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +If any of the above provisions are held to be in violation of applicable law, void, or unenforceable in any jurisdiction, then such provisions are waived to the extent necessary for this Disclaimer to be otherwise enforceable in such jurisdiction. + Modified: trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties =================================================================== --- trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties 2014-01-26 18:26:26 UTC (rev 9542) +++ trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties 2014-01-26 18:41:23 UTC (rev 9543) @@ -63,7 +63,7 @@ license.1.file=License license.2.file=japi.jar-LICENSE -license.3.file=jlfgr-1_0.jar-LICENSE +license.3.file=jlfgr-1.0.jar-LICENSE license.4.file=log4j-1.2.13.jar-LICENSE about.logo=icons/atrinikLogoSmall.png Modified: trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties =================================================================== --- trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties 2014-01-26 18:26:26 UTC (rev 9542) +++ trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties 2014-01-26 18:41:23 UTC (rev 9543) @@ -63,7 +63,7 @@ license.1.file=License license.2.file=japi.jar-LICENSE -license.3.file=jlfgr-1_0.jar-LICENSE +license.3.file=jlfgr-1.0.jar-LICENSE license.4.file=log4j-1.2.13.jar-LICENSE about.logo=icons/daimoninLogoSmall.png Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties =================================================================== --- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-26 18:26:26 UTC (rev 9542) +++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-26 18:41:23 UTC (rev 9543) @@ -980,7 +980,7 @@ license.2.title=JAPI license.2.file=japi.jar-LICENSE license.3.title=SUN Icons -license.3.file=jlfgr-1_0.jar-LICENSE +license.3.file=jlfgr-1.0.jar-LICENSE license.4.title=BeanShell license.4.file=bsh-LICENSE license.5.title=Log4J This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-26 18:26:46
|
Revision: 9542 http://sourceforge.net/p/gridarta/code/9542 Author: akirschbaum Date: 2014-01-26 18:26:26 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Convert flat file repository to Maven repository. Modified Paths: -------------- trunk/build.gradle trunk/build.xml trunk/gridarta.ipr trunk/src/atrinik/build.gradle trunk/src/crossfire/build.gradle trunk/src/daimonin/build.gradle trunk/src/gridarta/build.gradle trunk/src/model/build.gradle trunk/src/plugin/build.gradle trunk/src/preferences/build.gradle trunk/src/project/build.gradle trunk/src/utils/build.gradle Added Paths: ----------- trunk/repo/ trunk/repo/annotations/ trunk/repo/annotations/0.0/ trunk/repo/annotations/0.0/annotations-0.0.jar trunk/repo/antmeat/ trunk/repo/antmeat/0.3/ trunk/repo/antmeat/0.3/antmeat-0.3.jar trunk/repo/antmeat/0.3/antmeat-0.3.jar-LICENSE trunk/repo/bsh/ trunk/repo/bsh/bsh-LICENSE trunk/repo/bsh/bsh-classgen/ trunk/repo/bsh/bsh-classgen/2.0b4/ trunk/repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar trunk/repo/bsh/bsh-commands/ trunk/repo/bsh/bsh-commands/2.0b4/ trunk/repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar trunk/repo/bsh/bsh-core/ trunk/repo/bsh/bsh-core/2.0b4/ trunk/repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar trunk/repo/bsh/bsh-util/ trunk/repo/bsh/bsh-util/2.0b4/ trunk/repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar trunk/repo/checkstyle-all/ trunk/repo/checkstyle-all/5.0/ trunk/repo/checkstyle-all/5.0/checkstyle-all-5.0.jar trunk/repo/checkstyle-all/5.0/checkstyle-all-5.0.jar-LICENSE trunk/repo/japi-lib/ trunk/repo/japi-lib/japi-lib-lang/ trunk/repo/japi-lib/japi-lib-lang/0.1.0/ trunk/repo/japi-lib/japi-lib-lang/0.1.0/japi-lib-lang-0.1.0.jar trunk/repo/japi-lib/japi-lib-swing-about/ trunk/repo/japi-lib/japi-lib-swing-about/0.1.0/ trunk/repo/japi-lib/japi-lib-swing-about/0.1.0/japi-lib-swing-about-0.1.0.jar trunk/repo/japi-lib/japi-lib-swing-action/ trunk/repo/japi-lib/japi-lib-swing-action/0.1.0/ trunk/repo/japi-lib/japi-lib-swing-action/0.1.0/japi-lib-swing-action-0.1.0.jar trunk/repo/japi-lib/japi-lib-swing-extlib/ trunk/repo/japi-lib/japi-lib-swing-extlib/0.1.0/ trunk/repo/japi-lib/japi-lib-swing-extlib/0.1.0/japi-lib-swing-extlib-0.1.0.jar trunk/repo/japi-lib/japi-lib-swing-misc/ trunk/repo/japi-lib/japi-lib-swing-misc/trunk-1398/ trunk/repo/japi-lib/japi-lib-swing-misc/trunk-1398/japi-lib-swing-misc-trunk-1398.jar trunk/repo/japi-lib/japi-lib-swing-prefs/ trunk/repo/japi-lib/japi-lib-swing-prefs/0.1.0/ trunk/repo/japi-lib/japi-lib-swing-prefs/0.1.0/japi-lib-swing-prefs-0.1.0.jar trunk/repo/japi-lib/japi-lib-swing-tod/ trunk/repo/japi-lib/japi-lib-swing-tod/0.1.0/ trunk/repo/japi-lib/japi-lib-swing-tod/0.1.0/japi-lib-swing-tod-0.1.0.jar trunk/repo/japi-lib/japi-lib-util/ trunk/repo/japi-lib/japi-lib-util/trunk-1410/ trunk/repo/japi-lib/japi-lib-util/trunk-1410/japi-lib-util-trunk-1410.jar trunk/repo/japi-lib/japi-lib-xml/ trunk/repo/japi-lib/japi-lib-xml/0.1.0/ trunk/repo/japi-lib/japi-lib-xml/0.1.0/japi-lib-xml-0.1.0.jar trunk/repo/japi-lib/japi.jar-LICENSE trunk/repo/java-getopt/ trunk/repo/java-getopt/1.0.13/ trunk/repo/java-getopt/1.0.13/java-getopt-1.0.13.jar trunk/repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE trunk/repo/jdom/ trunk/repo/jdom/1.0/ trunk/repo/jdom/1.0/jdom-1.0.jar trunk/repo/jdom/1.0/jdom-1.0.jar-LICENSE trunk/repo/junit/ trunk/repo/junit/4.2/ trunk/repo/junit/4.2/junit-4.2.jar trunk/repo/junit/4.2/junit-4.2.jar-LICENSE trunk/repo/log4j/ trunk/repo/log4j/1.2.13/ trunk/repo/log4j/1.2.13/log4j-1.2.13.jar trunk/repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE trunk/repo/rsyntaxtextarea/ trunk/repo/rsyntaxtextarea/1.5.1/ trunk/repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1-README trunk/repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar trunk/repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE Removed Paths: ------------- trunk/lib/annotations-0.0.jar trunk/lib/antmeat-0.3.jar trunk/lib/antmeat-0.3.jar-LICENSE trunk/lib/bsh-LICENSE trunk/lib/bsh-classgen-2.0b4.jar trunk/lib/bsh-commands-2.0b4.jar trunk/lib/bsh-core-2.0b4.jar trunk/lib/bsh-util-2.0b4.jar trunk/lib/checkstyle-all-5.0.jar trunk/lib/checkstyle-all-5.0.jar-LICENSE trunk/lib/japi-lib-lang-0.1.0.jar trunk/lib/japi-lib-swing-about-0.1.0.jar trunk/lib/japi-lib-swing-action-0.1.0.jar trunk/lib/japi-lib-swing-extlib-0.1.0.jar trunk/lib/japi-lib-swing-misc-trunk-1398.jar trunk/lib/japi-lib-swing-prefs-0.1.0.jar trunk/lib/japi-lib-swing-tod-0.1.0.jar trunk/lib/japi-lib-util-trunk-1410.jar trunk/lib/japi-lib-xml-0.1.0.jar trunk/lib/japi.jar-LICENSE trunk/lib/java-getopt-1.0.13.jar trunk/lib/java-getopt-1.0.13.jar-LICENSE trunk/lib/jdom-1.0.jar trunk/lib/jdom-1.0.jar-LICENSE trunk/lib/junit-4.2.jar trunk/lib/junit-4.2.jar-LICENSE trunk/lib/log4j-1.2.13.jar trunk/lib/log4j-1.2.13.jar-LICENSE trunk/lib/rsyntaxtextarea-1.5.1-README trunk/lib/rsyntaxtextarea-1.5.1.jar trunk/lib/rsyntaxtextarea-1.5.1.jar-LICENSE Modified: trunk/build.gradle =================================================================== --- trunk/build.gradle 2014-01-25 18:14:15 UTC (rev 9541) +++ trunk/build.gradle 2014-01-26 18:26:26 UTC (rev 9542) @@ -6,8 +6,8 @@ // Add lib directory as repository for .jar files. allprojects { repositories { - flatDir { - dirs rootProject.file('lib') + maven { + url "$rootDir/repo" } } } Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2014-01-25 18:14:15 UTC (rev 9541) +++ trunk/build.xml 2014-01-26 18:26:26 UTC (rev 9542) @@ -138,29 +138,30 @@ <pathelement location="${build.dir}/utils/test"/> </path> - <path id="path.lib.annotations" location="lib/annotations-0.0.jar"/> - <path id="path.lib.bsh-core" location="lib/bsh-core-2.0b4.jar"/> - <path id="path.lib.bsh-util" location="lib/bsh-util-2.0b4.jar"/> - <path id="path.lib.getopt" location="lib/java-getopt-1.0.13.jar"/> - <path id="path.lib.japi-swing-about" location="lib/japi-lib-swing-about-0.1.0.jar"/> - <path id="path.lib.japi-swing-action" location="lib/japi-lib-swing-action-0.1.0.jar"/> - <path id="path.lib.japi-swing-misc" location="lib/japi-lib-swing-misc-trunk-1398.jar"/> - <path id="path.lib.japi-swing-prefs" location="lib/japi-lib-swing-prefs-0.1.0.jar"/> - <path id="path.lib.japi-swing-tod" location="lib/japi-lib-swing-tod-0.1.0.jar"/> - <path id="path.lib.japi-util" location="lib/japi-lib-util-trunk-1410.jar"/> - <path id="path.lib.japi-xml" location="lib/japi-lib-xml-0.1.0.jar"/> - <path id="path.lib.jdom" location="lib/jdom-1.0.jar"/> - <path id="path.lib.log4j" location="lib/log4j-1.2.13.jar"/> - <path id="path.lib.junit" location="lib/junit-4.2.jar"/> - <path id="path.lib.rsyntaxtextarea" location="lib/rsyntaxtextarea-1.5.1.jar"/> + <path id="path.lib.annotations" location="repo/annotations/0.0/annotations-0.0.jar"/> + <path id="path.lib.bsh-core" location="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar"/> + <path id="path.lib.bsh-util" location="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar"/> + <path id="path.lib.getopt" location="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/> + <path id="path.lib.japi-swing-about" location="repo/japi-lib/japi-lib-swing-about/0.1.0/japi-lib-swing-about-0.1.0.jar"/> + <path id="path.lib.japi-swing-action" location="repo/japi-lib/japi-lib-swing-action/0.1.0/japi-lib-swing-action-0.1.0.jar"/> + <path id="path.lib.japi-swing-misc" location="repo/japi-lib/japi-lib-swing-misc/trunk-1398/japi-lib-swing-misc-trunk-1398.jar"/> + <path id="path.lib.japi-swing-prefs" location="repo/japi-lib/japi-lib-swing-prefs/0.1.0/japi-lib-swing-prefs-0.1.0.jar"/> + <path id="path.lib.japi-swing-tod" location="repo/japi-lib/japi-lib-swing-tod/0.1.0/japi-lib-swing-tod-0.1.0.jar"/> + <path id="path.lib.japi-util" location="repo/japi-lib/japi-lib-util/trunk-1410/japi-lib-util-trunk-1410.jar"/> + <path id="path.lib.japi-xml" location="repo/japi-lib/japi-lib-xml/0.1.0/japi-lib-xml-0.1.0.jar"/> + <path id="path.lib.jdom" location="repo/jdom/1.0/jdom-1.0.jar"/> + <path id="path.lib.log4j" location="repo/log4j/1.2.13/log4j-1.2.13.jar"/> + <path id="path.lib.junit" location="repo/junit/4.2/junit-4.2.jar"/> + <path id="path.lib.rsyntaxtextarea" location="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/> <path id="xsltpath"> <fileset dir="lib" includes="**/*.jar"/> + <fileset dir="repo" includes="**/*.jar"/> </path> <taskdef name="megaxslt" classpathref="xsltpath" classname="com.hujer.ant.tasks.megaxslt.MegaXsltTask"/> <taskdef name="rgzip" classpath="lib/megaxslt.jar" classname="com.hujer.ant.tasks.rgzip.RGZipTask"/> <taskdef name="pack200" classpath="lib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task"/> - <taskdef name="freshmeat" classpath="lib/antmeat-0.3.jar" classname="de.frewert.ant.freshmeat.Announcement"> + <taskdef name="freshmeat" classpath="repo/antmeat/0.3/antmeat-0.3.jar" classname="de.frewert.ant.freshmeat.Announcement"> <classpath> <pathelement path="lib/xmlrpc-2.0.1.jar"/> <pathelement path="lib/commons-codec-1.3.jar"/> @@ -209,23 +210,21 @@ <fileset dir="src/atrinik/lib"> <include name="*-LICENSE"/> </fileset> - <fileset dir="lib"> - <include name="bsh-LICENSE"/> - <include name="japi.jar-LICENSE"/> - <include name="java-getopt-1.0.13.jar-LICENSE"/> - <include name="jdom-1.0.jar-LICENSE"/> - <include name="log4j-1.2.13.jar-LICENSE"/> - <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/> - </fileset> - <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/**"/> - <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/> - <zipfileset src="lib/java-getopt-1.0.13.jar"/> - <zipfileset src="lib/jdom-1.0.jar"/> - <zipfileset src="lib/log4j-1.2.13.jar"/> - <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/> - <zipgroupfileset dir="lib/" includes="japi-*.jar"/> + <fileset file="repo/bsh/bsh-LICENSE"/> + <fileset file="repo/japi-lib/japi.jar-LICENSE"/> + <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/> + <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/> + <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/> + <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/> + <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/> + <zipfileset src="repo/jdom/1.0/jdom-1.0.jar"/> + <zipfileset src="repo/log4j/1.2.13/log4j-1.2.13.jar"/> + <zipfileset src="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/> + <zipgroupfileset dir="repo/japi-lib" includes="**/japi-lib-*.jar"/> <manifest> <attribute name="Main-Class" value="net.sf.gridarta.var.atrinik.maincontrol.AtrinikEditor"/> <attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/> @@ -248,23 +247,21 @@ <fileset dir="src/crossfire/lib"> <include name="*-LICENSE"/> </fileset> - <fileset dir="lib"> - <include name="bsh-LICENSE"/> - <include name="japi.jar-LICENSE"/> - <include name="java-getopt-1.0.13.jar-LICENSE"/> - <include name="jdom-1.0.jar-LICENSE"/> - <include name="log4j-1.2.13.jar-LICENSE"/> - <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/> - </fileset> - <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/**"/> - <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/> - <zipfileset src="lib/java-getopt-1.0.13.jar"/> - <zipfileset src="lib/jdom-1.0.jar" excludes="META-INF/**"/> - <zipfileset src="lib/log4j-1.2.13.jar"/> - <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/> - <zipgroupfileset dir="lib/" includes="japi-*.jar"/> + <fileset file="repo/bsh/bsh-LICENSE"/> + <fileset file="repo/japi-lib/japi.jar-LICENSE"/> + <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/> + <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/> + <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/> + <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/> + <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/> + <zipfileset src="repo/jdom/1.0/jdom-1.0.jar" excludes="META-INF/**"/> + <zipfileset src="repo/log4j/1.2.13/log4j-1.2.13.jar"/> + <zipfileset src="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/> + <zipgroupfileset dir="repo/japi-lib" includes="**/japi-lib-*.jar"/> <manifest> <attribute name="Main-Class" value="net.sf.gridarta.var.crossfire.maincontrol.CrossfireEditor"/> <attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/> @@ -287,23 +284,21 @@ <fileset dir="src/daimonin/lib"> <include name="*-LICENSE"/> </fileset> - <fileset dir="lib"> - <include name="bsh-LICENSE"/> - <include name="japi.jar-LICENSE"/> - <include name="java-getopt-1.0.13.jar-LICENSE"/> - <include name="jdom-1.0.jar-LICENSE"/> - <include name="log4j-1.2.13.jar-LICENSE"/> - <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/> - </fileset> - <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/**"/> - <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/> - <zipfileset src="lib/java-getopt-1.0.13.jar"/> - <zipfileset src="lib/jdom-1.0.jar"/> - <zipfileset src="lib/log4j-1.2.13.jar"/> - <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/> - <zipgroupfileset dir="lib/" includes="japi-*.jar"/> + <fileset file="repo/bsh/bsh-LICENSE"/> + <fileset file="repo/japi-lib/japi.jar-LICENSE"/> + <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/> + <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/> + <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/> + <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/> + <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/> + <zipfileset src="repo/jdom/1.0/jdom-1.0.jar"/> + <zipfileset src="repo/log4j/1.2.13/log4j-1.2.13.jar"/> + <zipfileset src="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/> + <zipgroupfileset dir="repo/japi-lib" includes="**/japi-lib-*.jar"/> <manifest> <attribute name="Main-Class" value="net.sf.gridarta.var.daimonin.maincontrol.DaimoninEditor"/> <attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/> @@ -719,6 +714,7 @@ <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"/> + <fileset dir="repo" includes="**/*.jar" excludes="*.jar-LICENSE"/> </classpath> <sourcepath> <pathelement path="${user.javadoc.javasrc}"/> @@ -917,7 +913,7 @@ </target> <target name="checkstyle" description="Runs checkstyle to style-check the source code"> - <taskdef resource="checkstyletask.properties" classpath="lib/checkstyle-all-5.0.jar"/> + <taskdef resource="checkstyletask.properties" classpath="repo/checkstyle-all/5.0/checkstyle-all-5.0.jar"/> <mkdir dir="${build.dir}/doc"/> <checkstyle config="config/checkstyle/checkstyle.xml" failOnViolation="true"> <formatter type="plain" tofile="${build.dir}/doc/checkstyle_report.txt"/> @@ -967,6 +963,7 @@ <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"/> + <fileset dir="repo" includes="**/*.jar" excludes="*.jar-LICENSE"/> </classpath> <sourcepath> <pathelement path="${user.javadoc.javasrc}"/> Modified: trunk/gridarta.ipr =================================================================== --- trunk/gridarta.ipr 2014-01-25 18:14:15 UTC (rev 9541) +++ trunk/gridarta.ipr 2014-01-26 18:26:26 UTC (rev 9542) @@ -2295,126 +2295,126 @@ <component name="libraryTable"> <library name="annotations"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/annotations-0.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/rep/annotations/0.0/annotations-0.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="bsh-commands"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/bsh-commands-2.0b4.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="bsh-core"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/bsh-core-2.0b4.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="bsh-util"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/bsh-util-2.0b4.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="japi-lib-lang"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/japi-lib-lang-0.1.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-lang/0.1.0/japi-lib-lang-0.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="japi-lib-swing-about"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-about-0.1.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-about/0.1.0/japi-lib-swing-about-0.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="japi-lib-swing-action"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-action-0.1.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-action/0.1.0/japi-lib-swing-action-0.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="japi-lib-swing-extlib"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-extlib-0.1.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-extlib/0.1.0/japi-lib-swing-extlib-0.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="japi-lib-swing-misc"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-misc-trunk-1398.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-misc/trunk-1398/japi-lib-swing-misc-trunk-1398.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="japi-lib-swing-prefs"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-prefs-0.1.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib-swing-prefs/0.1.0/japi-lib-swing-prefs-0.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="japi-lib-swing-tod"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-tod-0.1.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-tod/0.1.0/japi-lib-swing-tod-0.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="japi-lib-util"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/japi-lib-util-trunk-1410.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-util/trunk-1410/japi-lib-util-trunk-1410.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="japi-lib-xml"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/japi-lib-xml-0.1.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-xml/0.1.0/japi-lib-xml-0.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="java-getopt"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/java-getopt-1.0.13.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/java-getopt/1.0.13/java-getopt-1.0.13.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="jdom"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/jdom-1.0.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/jdom/1.0/jdom-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="junit"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/junit-4.2.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/junit/4.2/junit-4.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="log4j"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.13.jar!/" /> + <root url="jar://$PROJECT_DIR$/repo/log4j/1.2.13/log4j-1.2.13.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> <library name="rsyntaxtextarea"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/rsyntaxtextarea-1.5.1.jar!/" /> + <root url="jar://$PROJECT_DIR$/../gridarta.tmprepo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> Deleted: trunk/lib/annotations-0.0.jar =================================================================== (Binary files differ) Deleted: trunk/lib/antmeat-0.3.jar =================================================================== (Binary files differ) Deleted: trunk/lib/antmeat-0.3.jar-LICENSE =================================================================== --- trunk/lib/antmeat-0.3.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541) +++ trunk/lib/antmeat-0.3.jar-LICENSE 2014-01-26 18:26:26 UTC (rev 9542) @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. Deleted: trunk/lib/bsh-LICENSE =================================================================== --- trunk/lib/bsh-LICENSE 2014-01-25 18:14:15 UTC (rev 9541) +++ trunk/lib/bsh-LICENSE 2014-01-26 18:26:26 UTC (rev 9542) @@ -1,502 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR ... [truncated message content] |
From: <aki...@us...> - 2014-01-25 18:14:23
|
Revision: 9541 http://sourceforge.net/p/gridarta/code/9541 Author: akirschbaum Date: 2014-01-25 18:14:15 +0000 (Sat, 25 Jan 2014) Log Message: ----------- Add version numbers to some .jar file names. Modified Paths: -------------- trunk/build.xml trunk/gridarta.ipr trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties trunk/src/model/build.gradle Added Paths: ----------- trunk/lib/antmeat-0.3.jar trunk/lib/antmeat-0.3.jar-LICENSE trunk/lib/jdom-1.0.jar trunk/lib/jdom-1.0.jar-LICENSE Removed Paths: ------------- trunk/lib/antmeat.jar trunk/lib/antmeat.jar-LICENSE trunk/lib/jdom.jar trunk/lib/jdom.jar-LICENSE Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2014-01-25 16:00:05 UTC (rev 9540) +++ trunk/build.xml 2014-01-25 18:14:15 UTC (rev 9541) @@ -149,7 +149,7 @@ <path id="path.lib.japi-swing-tod" location="lib/japi-lib-swing-tod-0.1.0.jar"/> <path id="path.lib.japi-util" location="lib/japi-lib-util-trunk-1410.jar"/> <path id="path.lib.japi-xml" location="lib/japi-lib-xml-0.1.0.jar"/> - <path id="path.lib.jdom" location="lib/jdom.jar"/> + <path id="path.lib.jdom" location="lib/jdom-1.0.jar"/> <path id="path.lib.log4j" location="lib/log4j-1.2.13.jar"/> <path id="path.lib.junit" location="lib/junit-4.2.jar"/> <path id="path.lib.rsyntaxtextarea" location="lib/rsyntaxtextarea-1.5.1.jar"/> @@ -160,7 +160,7 @@ <taskdef name="megaxslt" classpathref="xsltpath" classname="com.hujer.ant.tasks.megaxslt.MegaXsltTask"/> <taskdef name="rgzip" classpath="lib/megaxslt.jar" classname="com.hujer.ant.tasks.rgzip.RGZipTask"/> <taskdef name="pack200" classpath="lib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task"/> - <taskdef name="freshmeat" classpath="lib/antmeat.jar" classname="de.frewert.ant.freshmeat.Announcement"> + <taskdef name="freshmeat" classpath="lib/antmeat-0.3.jar" classname="de.frewert.ant.freshmeat.Announcement"> <classpath> <pathelement path="lib/xmlrpc-2.0.1.jar"/> <pathelement path="lib/commons-codec-1.3.jar"/> @@ -213,7 +213,7 @@ <include name="bsh-LICENSE"/> <include name="japi.jar-LICENSE"/> <include name="java-getopt-1.0.13.jar-LICENSE"/> - <include name="jdom.jar-LICENSE"/> + <include name="jdom-1.0.jar-LICENSE"/> <include name="log4j-1.2.13.jar-LICENSE"/> <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/> </fileset> @@ -222,7 +222,7 @@ <zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/> <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/> <zipfileset src="lib/java-getopt-1.0.13.jar"/> - <zipfileset src="lib/jdom.jar"/> + <zipfileset src="lib/jdom-1.0.jar"/> <zipfileset src="lib/log4j-1.2.13.jar"/> <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/> <zipgroupfileset dir="lib/" includes="japi-*.jar"/> @@ -252,7 +252,7 @@ <include name="bsh-LICENSE"/> <include name="japi.jar-LICENSE"/> <include name="java-getopt-1.0.13.jar-LICENSE"/> - <include name="jdom.jar-LICENSE"/> + <include name="jdom-1.0.jar-LICENSE"/> <include name="log4j-1.2.13.jar-LICENSE"/> <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/> </fileset> @@ -261,7 +261,7 @@ <zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/> <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/> <zipfileset src="lib/java-getopt-1.0.13.jar"/> - <zipfileset src="lib/jdom.jar" excludes="META-INF/**"/> + <zipfileset src="lib/jdom-1.0.jar" excludes="META-INF/**"/> <zipfileset src="lib/log4j-1.2.13.jar"/> <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/> <zipgroupfileset dir="lib/" includes="japi-*.jar"/> @@ -291,7 +291,7 @@ <include name="bsh-LICENSE"/> <include name="japi.jar-LICENSE"/> <include name="java-getopt-1.0.13.jar-LICENSE"/> - <include name="jdom.jar-LICENSE"/> + <include name="jdom-1.0.jar-LICENSE"/> <include name="log4j-1.2.13.jar-LICENSE"/> <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/> </fileset> @@ -300,7 +300,7 @@ <zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/> <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/> <zipfileset src="lib/java-getopt-1.0.13.jar"/> - <zipfileset src="lib/jdom.jar"/> + <zipfileset src="lib/jdom-1.0.jar"/> <zipfileset src="lib/log4j-1.2.13.jar"/> <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/> <zipgroupfileset dir="lib/" includes="japi-*.jar"/> Modified: trunk/gridarta.ipr =================================================================== --- trunk/gridarta.ipr 2014-01-25 16:00:05 UTC (rev 9540) +++ trunk/gridarta.ipr 2014-01-25 18:14:15 UTC (rev 9541) @@ -2393,7 +2393,7 @@ </library> <library name="jdom"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/jdom.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/jdom-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> Copied: trunk/lib/antmeat-0.3.jar (from rev 9539, trunk/lib/antmeat.jar) =================================================================== (Binary files differ) Copied: trunk/lib/antmeat-0.3.jar-LICENSE (from rev 9539, trunk/lib/antmeat.jar-LICENSE) =================================================================== --- trunk/lib/antmeat-0.3.jar-LICENSE (rev 0) +++ trunk/lib/antmeat-0.3.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541) @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Deleted: trunk/lib/antmeat.jar =================================================================== (Binary files differ) Deleted: trunk/lib/antmeat.jar-LICENSE =================================================================== --- trunk/lib/antmeat.jar-LICENSE 2014-01-25 16:00:05 UTC (rev 9540) +++ trunk/lib/antmeat.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541) @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. Copied: trunk/lib/jdom-1.0.jar (from rev 9539, trunk/lib/jdom.jar) =================================================================== (Binary files differ) Copied: trunk/lib/jdom-1.0.jar-LICENSE (from rev 9539, trunk/lib/jdom.jar-LICENSE) =================================================================== --- trunk/lib/jdom-1.0.jar-LICENSE (rev 0) +++ trunk/lib/jdom-1.0.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541) @@ -0,0 +1,49 @@ +Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions, and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions, and the disclaimer that follows + these conditions in the documentation and/or other materials + provided with the distribution. + +3. The name "JDOM" must not be used to endorse or promote products + derived from this software without prior written permission. For + written permission, please contact <request_AT_jdom_DOT_org>. + +4. Products derived from this software may not be called "JDOM", nor + may "JDOM" appear in their name, without prior written permission + from the JDOM Project Management <request_AT_jdom_DOT_org>. + +In addition, we request (but do not require) that you include in the +end-user documentation provided with the redistribution and/or in the +software itself an acknowledgement equivalent to the following: + "This product includes software developed by the + JDOM Project (http://www.jdom.org/)." +Alternatively, the acknowledgment may be graphical using the logos +available at http://www.jdom.org/images/logos. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +This software consists of voluntary contributions made by many +individuals on behalf of the JDOM Project and was originally +created by Jason Hunter <jhunter_AT_jdom_DOT_org> and +Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information +on the JDOM Project, please see <http://www.jdom.org/>. Deleted: trunk/lib/jdom.jar =================================================================== (Binary files differ) Deleted: trunk/lib/jdom.jar-LICENSE =================================================================== --- trunk/lib/jdom.jar-LICENSE 2014-01-25 16:00:05 UTC (rev 9540) +++ trunk/lib/jdom.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541) @@ -1,49 +0,0 @@ -Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions, and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions, and the disclaimer that follows - these conditions in the documentation and/or other materials - provided with the distribution. - -3. The name "JDOM" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact <request_AT_jdom_DOT_org>. - -4. Products derived from this software may not be called "JDOM", nor - may "JDOM" appear in their name, without prior written permission - from the JDOM Project Management <request_AT_jdom_DOT_org>. - -In addition, we request (but do not require) that you include in the -end-user documentation provided with the redistribution and/or in the -software itself an acknowledgement equivalent to the following: - "This product includes software developed by the - JDOM Project (http://www.jdom.org/)." -Alternatively, the acknowledgment may be graphical using the logos -available at http://www.jdom.org/images/logos. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -This software consists of voluntary contributions made by many -individuals on behalf of the JDOM Project and was originally -created by Jason Hunter <jhunter_AT_jdom_DOT_org> and -Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information -on the JDOM Project, please see <http://www.jdom.org/>. Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties =================================================================== --- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-25 16:00:05 UTC (rev 9540) +++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-25 18:14:15 UTC (rev 9541) @@ -986,7 +986,7 @@ license.5.title=Log4J license.5.file=log4j-1.2.13.jar-LICENSE license.6.title=JDOM -license.6.file=jdom.jar-LICENSE +license.6.file=jdom-1.0.jar-LICENSE license.7.title=GNU getopt license.7.file=java-getopt-1.0.13.jar-LICENSE license.8.title=RSyntaxTextArea Modified: trunk/src/model/build.gradle =================================================================== --- trunk/src/model/build.gradle 2014-01-25 16:00:05 UTC (rev 9540) +++ trunk/src/model/build.gradle 2014-01-25 18:14:15 UTC (rev 9541) @@ -7,7 +7,7 @@ dependencies { compile name: 'annotations', version: '0.0' compile name: 'japi-lib-swing-misc', version: 'trunk-1398' - compile name: 'jdom', version: '0.0' + compile name: 'jdom', version: '1.0' compile name: 'log4j', version: '1.2.13' compile project(':src:utils') testCompile name: 'junit', version: '4.2' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-25 16:00:13
|
Revision: 9540 http://sourceforge.net/p/gridarta/code/9540 Author: akirschbaum Date: 2014-01-25 16:00:05 +0000 (Sat, 25 Jan 2014) Log Message: ----------- Fix some compiler warnings. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ControlClientAction.java trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ControlServerAction.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ControlClientAction.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ControlClientAction.java 2014-01-25 08:26:38 UTC (rev 9539) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ControlClientAction.java 2014-01-25 16:00:05 UTC (rev 9540) @@ -60,12 +60,15 @@ */ @ActionMethod public void controlClient() { + final ProcessRunner tmpControlClient; if (controlClient == null) { - controlClient = new ProcessRunner("controlClient", new String[] { appPreferencesModel.getClient(), }); + tmpControlClient = new ProcessRunner("controlClient", new String[] { appPreferencesModel.getClient(), }); + controlClient = tmpControlClient; } else { - controlClient.setCommand(new String[] { appPreferencesModel.getClient(), }); + tmpControlClient = controlClient; + tmpControlClient.setCommand(new String[] { appPreferencesModel.getClient(), }); } - controlClient.showDialog(parent); + tmpControlClient.showDialog(parent); } /** Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ControlServerAction.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ControlServerAction.java 2014-01-25 08:26:38 UTC (rev 9539) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ControlServerAction.java 2014-01-25 16:00:05 UTC (rev 9540) @@ -68,13 +68,16 @@ */ @ActionMethod public void controlServer() { + final ProcessRunner tmpControlServer; if (controlServer == null) { - controlServer = new ProcessRunner("controlServer", new String[] { appPreferencesModel.getServer(), }); + tmpControlServer = new ProcessRunner("controlServer", new String[] { appPreferencesModel.getServer(), }); + controlServer = tmpControlServer; ACTION_BUILDER.showOnetimeMessageDialog(parent, JOptionPane.WARNING_MESSAGE, "controlServerWarning"); } else { - controlServer.setCommand(new String[] { appPreferencesModel.getServer(), }); + tmpControlServer = controlServer; + tmpControlServer.setCommand(new String[] { appPreferencesModel.getServer(), }); } - controlServer.showDialog(parent); + tmpControlServer.showDialog(parent); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-25 08:26:42
|
Revision: 9539 http://sourceforge.net/p/gridarta/code/9539 Author: akirschbaum Date: 2014-01-25 08:26:38 +0000 (Sat, 25 Jan 2014) Log Message: ----------- Fix comments. Modified Paths: -------------- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ShrinkSelectionAction.java Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java 2014-01-24 08:56:06 UTC (rev 9538) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java 2014-01-25 08:26:38 UTC (rev 9539) @@ -25,7 +25,6 @@ import net.sf.gridarta.gui.map.mapview.MapView; import net.sf.gridarta.gui.map.mapview.MapViewManager; import net.sf.gridarta.gui.map.mapview.MapViewManagerListener; -import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareModelListener; import net.sf.gridarta.model.archetype.Archetype; import net.sf.gridarta.model.gameobject.GameObject; import net.sf.gridarta.model.maparchobject.MapArchObject; @@ -88,8 +87,7 @@ }; /** - * The {@link SelectedSquareModelListener} attached to {@link - * #currentMapView}. + * The {@link MapGridListener} attached to {@link #currentMapView}. */ @NotNull private final MapGridListener mapGridListener = new MapGridListener() { Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ShrinkSelectionAction.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ShrinkSelectionAction.java 2014-01-24 08:56:06 UTC (rev 9538) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ShrinkSelectionAction.java 2014-01-25 08:26:38 UTC (rev 9539) @@ -27,7 +27,6 @@ import net.sf.gridarta.gui.map.mapview.MapView; import net.sf.gridarta.gui.map.mapview.MapViewManager; import net.sf.gridarta.gui.map.mapview.MapViewManagerListener; -import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareModelListener; import net.sf.gridarta.model.archetype.Archetype; import net.sf.gridarta.model.gameobject.GameObject; import net.sf.gridarta.model.maparchobject.MapArchObject; @@ -91,8 +90,7 @@ }; /** - * The {@link SelectedSquareModelListener} attached to {@link - * #currentMapView}. + * The {@link MapGridListener} attached to {@link #currentMapView}. */ @NotNull private final MapGridListener mapGridListener = new MapGridListener() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-24 08:56:12
|
Revision: 9538 http://sourceforge.net/p/gridarta/code/9538 Author: akirschbaum Date: 2014-01-24 08:56:06 +0000 (Fri, 24 Jan 2014) Log Message: ----------- Properly enable/disable Edit|Grow/Shrink Selection menu. Modified Paths: -------------- trunk/src/atrinik/ChangeLog trunk/src/crossfire/ChangeLog trunk/src/daimonin/ChangeLog trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ShrinkSelectionAction.java Modified: trunk/src/atrinik/ChangeLog =================================================================== --- trunk/src/atrinik/ChangeLog 2014-01-24 08:55:11 UTC (rev 9537) +++ trunk/src/atrinik/ChangeLog 2014-01-24 08:56:06 UTC (rev 9538) @@ -1,5 +1,7 @@ 2014-01-24 Andreas Kirschbaum + * Properly enable/disable Edit|Grow/Shrink Selection menu. + * Make Edit|Grow Selection to actually work. 2013-12-10 Andreas Kirschbaum Modified: trunk/src/crossfire/ChangeLog =================================================================== --- trunk/src/crossfire/ChangeLog 2014-01-24 08:55:11 UTC (rev 9537) +++ trunk/src/crossfire/ChangeLog 2014-01-24 08:56:06 UTC (rev 9538) @@ -1,5 +1,7 @@ 2014-01-24 Andreas Kirschbaum + * Properly enable/disable Edit|Grow/Shrink Selection menu. + * Make Edit|Grow Selection to actually work. 2013-12-10 Andreas Kirschbaum Modified: trunk/src/daimonin/ChangeLog =================================================================== --- trunk/src/daimonin/ChangeLog 2014-01-24 08:55:11 UTC (rev 9537) +++ trunk/src/daimonin/ChangeLog 2014-01-24 08:56:06 UTC (rev 9538) @@ -1,5 +1,7 @@ 2014-01-24 Andreas Kirschbaum + * Properly enable/disable Edit|Grow/Shrink Selection menu. + * Make Edit|Grow Selection to actually work. 2013-12-10 Andreas Kirschbaum Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java 2014-01-24 08:55:11 UTC (rev 9537) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java 2014-01-24 08:56:06 UTC (rev 9538) @@ -25,10 +25,13 @@ import net.sf.gridarta.gui.map.mapview.MapView; import net.sf.gridarta.gui.map.mapview.MapViewManager; import net.sf.gridarta.gui.map.mapview.MapViewManagerListener; +import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareModelListener; 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.mapgrid.MapGrid; +import net.sf.gridarta.model.mapgrid.MapGridEvent; +import net.sf.gridarta.model.mapgrid.MapGridListener; import net.sf.gridarta.model.mapgrid.SelectionMode; import net.sf.gridarta.model.mapmodel.MapModel; import net.sf.gridarta.model.mapmodel.MapSquare; @@ -64,7 +67,13 @@ @Override public void activeMapViewChanged(@Nullable final MapView<G, A, R> mapView) { + if (currentMapView != null) { + currentMapView.getMapGrid().removeMapGridListener(mapGridListener); + } currentMapView = mapView; + if (currentMapView != null) { + currentMapView.getMapGrid().addMapGridListener(mapGridListener); + } updateAction(); } @@ -79,12 +88,34 @@ }; /** + * The {@link SelectedSquareModelListener} attached to {@link + * #currentMapView}. + */ + @NotNull + private final MapGridListener mapGridListener = new MapGridListener() { + + @Override + public void mapGridChanged(@NotNull final MapGridEvent e) { + updateAction(); + } + + @Override + public void mapGridResized(@NotNull final MapGridEvent e) { + updateAction(); + } + + }; + + /** * Creates a new instance. * @param mapViewManager the map view manager */ public GrowSelectionAction(@NotNull final MapViewManager<G, A, R> mapViewManager) { mapViewManager.addMapViewManagerListener(mapViewManagerListener); currentMapView = mapViewManager.getActiveMapView(); + if (currentMapView != null) { + currentMapView.getMapGrid().addMapGridListener(mapGridListener); + } } /** Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ShrinkSelectionAction.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ShrinkSelectionAction.java 2014-01-24 08:55:11 UTC (rev 9537) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/action/ShrinkSelectionAction.java 2014-01-24 08:56:06 UTC (rev 9538) @@ -27,10 +27,13 @@ import net.sf.gridarta.gui.map.mapview.MapView; import net.sf.gridarta.gui.map.mapview.MapViewManager; import net.sf.gridarta.gui.map.mapview.MapViewManagerListener; +import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareModelListener; 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.mapgrid.MapGrid; +import net.sf.gridarta.model.mapgrid.MapGridEvent; +import net.sf.gridarta.model.mapgrid.MapGridListener; import net.sf.gridarta.model.mapgrid.SelectionMode; import net.sf.gridarta.model.mapmodel.MapModel; import net.sf.gridarta.model.mapmodel.MapSquare; @@ -67,7 +70,13 @@ @Override public void activeMapViewChanged(@Nullable final MapView<G, A, R> mapView) { + if (currentMapView != null) { + currentMapView.getMapGrid().removeMapGridListener(mapGridListener); + } currentMapView = mapView; + if (currentMapView != null) { + currentMapView.getMapGrid().addMapGridListener(mapGridListener); + } updateAction(); } @@ -82,12 +91,34 @@ }; /** + * The {@link SelectedSquareModelListener} attached to {@link + * #currentMapView}. + */ + @NotNull + private final MapGridListener mapGridListener = new MapGridListener() { + + @Override + public void mapGridChanged(@NotNull final MapGridEvent e) { + updateAction(); + } + + @Override + public void mapGridResized(@NotNull final MapGridEvent e) { + updateAction(); + } + + }; + + /** * Creates a new instance. * @param mapViewManager the map view manager */ public ShrinkSelectionAction(@NotNull final MapViewManager<G, A, R> mapViewManager) { mapViewManager.addMapViewManagerListener(mapViewManagerListener); currentMapView = mapViewManager.getActiveMapView(); + if (currentMapView != null) { + currentMapView.getMapGrid().addMapGridListener(mapGridListener); + } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-24 08:55:15
|
Revision: 9537 http://sourceforge.net/p/gridarta/code/9537 Author: akirschbaum Date: 2014-01-24 08:55:11 +0000 (Fri, 24 Jan 2014) Log Message: ----------- Fix typo. Modified Paths: -------------- trunk/src/atrinik/ChangeLog trunk/src/crossfire/ChangeLog trunk/src/daimonin/ChangeLog Modified: trunk/src/atrinik/ChangeLog =================================================================== --- trunk/src/atrinik/ChangeLog 2014-01-24 08:09:39 UTC (rev 9536) +++ trunk/src/atrinik/ChangeLog 2014-01-24 08:55:11 UTC (rev 9537) @@ -1,6 +1,6 @@ 2014-01-24 Andreas Kirschbaum - * Make Edit|Grow Selectionto actually work. + * Make Edit|Grow Selection to actually work. 2013-12-10 Andreas Kirschbaum Modified: trunk/src/crossfire/ChangeLog =================================================================== --- trunk/src/crossfire/ChangeLog 2014-01-24 08:09:39 UTC (rev 9536) +++ trunk/src/crossfire/ChangeLog 2014-01-24 08:55:11 UTC (rev 9537) @@ -1,6 +1,6 @@ 2014-01-24 Andreas Kirschbaum - * Make Edit|Grow Selectionto actually work. + * Make Edit|Grow Selection to actually work. 2013-12-10 Andreas Kirschbaum Modified: trunk/src/daimonin/ChangeLog =================================================================== --- trunk/src/daimonin/ChangeLog 2014-01-24 08:09:39 UTC (rev 9536) +++ trunk/src/daimonin/ChangeLog 2014-01-24 08:55:11 UTC (rev 9537) @@ -1,6 +1,6 @@ 2014-01-24 Andreas Kirschbaum - * Make Edit|Grow Selectionto actually work. + * Make Edit|Grow Selection to actually work. 2013-12-10 Andreas Kirschbaum This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2014-01-24 08:09:45
|
Revision: 9536 http://sourceforge.net/p/gridarta/code/9536 Author: akirschbaum Date: 2014-01-24 08:09:39 +0000 (Fri, 24 Jan 2014) Log Message: ----------- Make Edit|Grow Selectionto actually work. Modified Paths: -------------- trunk/src/atrinik/ChangeLog trunk/src/crossfire/ChangeLog trunk/src/daimonin/ChangeLog trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java Modified: trunk/src/atrinik/ChangeLog =================================================================== --- trunk/src/atrinik/ChangeLog 2014-01-07 20:22:47 UTC (rev 9535) +++ trunk/src/atrinik/ChangeLog 2014-01-24 08:09:39 UTC (rev 9536) @@ -1,3 +1,7 @@ +2014-01-24 Andreas Kirschbaum + + * Make Edit|Grow Selectionto actually work. + 2013-12-10 Andreas Kirschbaum * Add "Browse archetypes" to archetypes menu. It shows a dialog to Modified: trunk/src/crossfire/ChangeLog =================================================================== --- trunk/src/crossfire/ChangeLog 2014-01-07 20:22:47 UTC (rev 9535) +++ trunk/src/crossfire/ChangeLog 2014-01-24 08:09:39 UTC (rev 9536) @@ -1,3 +1,7 @@ +2014-01-24 Andreas Kirschbaum + + * Make Edit|Grow Selectionto actually work. + 2013-12-10 Andreas Kirschbaum * Add "Browse archetypes" to archetypes menu. It shows a dialog to Modified: trunk/src/daimonin/ChangeLog =================================================================== --- trunk/src/daimonin/ChangeLog 2014-01-07 20:22:47 UTC (rev 9535) +++ trunk/src/daimonin/ChangeLog 2014-01-24 08:09:39 UTC (rev 9536) @@ -1,3 +1,7 @@ +2014-01-24 Andreas Kirschbaum + + * Make Edit|Grow Selectionto actually work. + 2013-12-10 Andreas Kirschbaum * Add "Browse archetypes" to archetypes menu. It shows a dialog to Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java =================================================================== --- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java 2014-01-07 20:22:47 UTC (rev 9535) +++ trunk/src/gridarta/src/main/java/net/sf/gridarta/action/GrowSelectionAction.java 2014-01-24 08:09:39 UTC (rev 9536) @@ -91,7 +91,7 @@ * Grows the current map selection by one map square. */ @ActionMethod - public void shrinkSelection() { + public void growSelection() { doGrowSelection(true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |