mirror of
https://github.com/bancika/diy-layout-creator
synced 2026-11-11 01:32:08 +10:00
fix undo error
improve ant builder to package zip files for deployment
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -9,6 +9,7 @@
|
|||||||
</listAttribute>
|
</listAttribute>
|
||||||
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
|
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
|
||||||
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;Library&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;DIYLC&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;Library&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;DIYLC&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
||||||
|
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
|
||||||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.diylc.DIYLCStarter"/>
|
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.diylc.DIYLCStarter"/>
|
||||||
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="diylc-swing"/>
|
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="diylc-swing"/>
|
||||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m -Dorg.diylc.scriptRun=true -Ddorg.diylc.debugComponentAreas=true"/>
|
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m -Dorg.diylc.scriptRun=true -Ddorg.diylc.debugComponentAreas=true"/>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<project name="diylc-swing" basedir="." default="mac">
|
<project name="diylc-swing" basedir="." default="complete">
|
||||||
|
|
||||||
<property name="src.dir" value="src" />
|
<property name="src.dir" value="src" />
|
||||||
|
|
||||||
@@ -7,6 +7,7 @@
|
|||||||
<property name="jar.dir" value="${build.dir}/jar" />
|
<property name="jar.dir" value="${build.dir}/jar" />
|
||||||
<property name="report.dir" value="${build.dir}/junitreport" />
|
<property name="report.dir" value="${build.dir}/junitreport" />
|
||||||
<property name="main.class" value="org.diylc.DIYLCStarter" />
|
<property name="main.class" value="org.diylc.DIYLCStarter" />
|
||||||
|
<property name="diylc.version" value="3.31.0" />
|
||||||
|
|
||||||
<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
|
<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
|
||||||
<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
|
<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
|
||||||
@@ -75,7 +76,7 @@
|
|||||||
<jarbundler bundleid="org.diylc"
|
<jarbundler bundleid="org.diylc"
|
||||||
dir="${jar.dir}"
|
dir="${jar.dir}"
|
||||||
name="DIYLC"
|
name="DIYLC"
|
||||||
version="3.30.0"
|
version="${diylc.version}"
|
||||||
mainclass="${main.class}"
|
mainclass="${main.class}"
|
||||||
stubfile="JavaApplicationStub"
|
stubfile="JavaApplicationStub"
|
||||||
vmoptions="-Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true"
|
vmoptions="-Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true"
|
||||||
@@ -96,7 +97,25 @@
|
|||||||
<!--<documenttype name="DIYLC Project"
|
<!--<documenttype name="DIYLC Project"
|
||||||
extensions="diylc"
|
extensions="diylc"
|
||||||
role="Editor"/>-->
|
role="Editor"/>-->
|
||||||
</jarbundler>
|
</jarbundler>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="complete" depends="mac">
|
||||||
|
<zip destfile="${build.dir}/diylc-${diylc.version}.zip">
|
||||||
|
<fileset dir="${jar.dir}" includes="diylc.jar"/>
|
||||||
|
<zipfileset dir="${jar.dir}/lib" prefix="lib"/>
|
||||||
|
<zipfileset dir="${jar.dir}/library/" prefix="library"/>
|
||||||
|
<zipfileset dir="templates" prefix="templates"/>
|
||||||
|
<zipfileset dir="themes" prefix="themes"/>
|
||||||
|
<zipfileset dir="." includes="update.xml"/>
|
||||||
|
<zipfileset dir="." includes="run.sh"/>
|
||||||
|
<zipfileset dir="." includes="diylc.l4j.ini"/>
|
||||||
|
<zipfileset dir="." includes="associations.bat"/>
|
||||||
|
<zipfileset dir="." includes="diylc.exe"/>
|
||||||
|
</zip>
|
||||||
|
<zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip">
|
||||||
|
<zipfileset dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app"/>
|
||||||
|
</zip>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="javadoc">
|
<target name="javadoc">
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
|||||||
java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -cp diylc.jar:lib org.diylc.DIYLCStarter
|
java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter
|
||||||
+7
-6
@@ -228,12 +228,12 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
|
|||||||
swingUI.injectMenuAction(getCopyAction(), EDIT_TITLE);
|
swingUI.injectMenuAction(getCopyAction(), EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(getPasteAction(), EDIT_TITLE);
|
swingUI.injectMenuAction(getPasteAction(), EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(null, EDIT_TITLE);
|
swingUI.injectMenuAction(null, EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(actionFactory
|
swingUI.injectMenuAction(
|
||||||
.createSelectAllAction(plugInPort), EDIT_TITLE);
|
actionFactory.createSelectAllAction(plugInPort), EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(getEditSelectionAction(), EDIT_TITLE);
|
swingUI.injectMenuAction(getEditSelectionAction(), EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(getDeleteSelectionAction(), EDIT_TITLE);
|
swingUI.injectMenuAction(getDeleteSelectionAction(), EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(getRotateClockwiseAction(), EDIT_TITLE);
|
swingUI.injectMenuAction(getRotateClockwiseAction(), EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(getRotateCounterclockwiseAction(), EDIT_TITLE);
|
swingUI.injectMenuAction(getRotateCounterclockwiseAction(), EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(getSendToBackAction(), EDIT_TITLE);
|
swingUI.injectMenuAction(getSendToBackAction(), EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(getBringToFrontAction(), EDIT_TITLE);
|
swingUI.injectMenuAction(getBringToFrontAction(), EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(getGroupAction(), EDIT_TITLE);
|
swingUI.injectMenuAction(getGroupAction(), EDIT_TITLE);
|
||||||
@@ -252,8 +252,8 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
|
|||||||
swingUI.injectMenuAction(getExpandSelectionSameTypeAction(),
|
swingUI.injectMenuAction(getExpandSelectionSameTypeAction(),
|
||||||
EXPAND_TITLE);
|
EXPAND_TITLE);
|
||||||
swingUI.injectMenuAction(null, EDIT_TITLE);
|
swingUI.injectMenuAction(null, EDIT_TITLE);
|
||||||
swingUI.injectMenuAction(actionFactory
|
swingUI.injectMenuAction(
|
||||||
.createEditProjectAction(plugInPort), EDIT_TITLE);
|
actionFactory.createEditProjectAction(plugInPort), EDIT_TITLE);
|
||||||
|
|
||||||
refreshActions();
|
refreshActions();
|
||||||
}
|
}
|
||||||
@@ -275,7 +275,8 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
|
|||||||
(String) params[2]);
|
(String) params[2]);
|
||||||
break;
|
break;
|
||||||
case PROJECT_LOADED:
|
case PROJECT_LOADED:
|
||||||
undoHandler.reset();
|
if ((Boolean) params[1])
|
||||||
|
undoHandler.reset();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1313,5 +1313,21 @@
|
|||||||
</changes>
|
</changes>
|
||||||
<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
|
<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
|
||||||
</org.diylc.appframework.update.Version>
|
</org.diylc.appframework.update.Version>
|
||||||
|
<org.diylc.appframework.update.Version>
|
||||||
|
<versionNumber>
|
||||||
|
<major>3</major>
|
||||||
|
<minor>31</minor>
|
||||||
|
<build>0</build>
|
||||||
|
</versionNumber>
|
||||||
|
<releaseDate>2016-05-09 20:00:00.000 CET</releaseDate>
|
||||||
|
<name></name>
|
||||||
|
<changes>
|
||||||
|
<org.diylc.appframework.update.Change>
|
||||||
|
<changeType>BUG_FIX</changeType>
|
||||||
|
<description>Undo works only one level back (bug introduced in 3.29)</description>
|
||||||
|
</org.diylc.appframework.update.Change>
|
||||||
|
</changes>
|
||||||
|
<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
|
||||||
|
</org.diylc.appframework.update.Version>
|
||||||
</a>
|
</a>
|
||||||
</java.util.Arrays_-ArrayList>
|
</java.util.Arrays_-ArrayList>
|
||||||
Reference in New Issue
Block a user