Skip to content

Commit b3edcd3

Browse files
t-ostert-oster
committed
copyrightheader
1 parent 9ebe402 commit b3edcd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+675
-689
lines changed

‎copyrightheader

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/**
22
* This file is part of LibLaserCut.
3-
* Copyright (C) 2011 - 2013 Thomas Oster <[email protected]>
4-
* RWTH Aachen University - 52062 Aachen, Germany
3+
* Copyright (C) 2011 - 2014 Thomas Oster <[email protected]>
54
*
6-
* LibLaserCut is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU Lesser General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
5+
* LibLaserCut is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU Lesser General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
109
*
11-
* LibLaserCut is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU Lesser General Public License for more details.
10+
* LibLaserCut is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU Lesser General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU Lesser General Public License
16+
* along with LibLaserCut. If not, see <http://www.gnu.org/licenses/>.
1517
*
16-
* You should have received a copy of the GNU Lesser General Public License
17-
* along with LibLaserCut. If not, see <http://www.gnu.org/licenses/>.
1818
**/

‎lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar

634 Bytes
Binary file not shown.

‎lib/nblibraries.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
libs.CopyLibs.classpath=\
22
${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
33
libs.CopyLibs.displayName=CopyLibs Task
4-
libs.CopyLibs.prop-version=1.0
4+
libs.CopyLibs.prop-version=2.0
55
libs.junit.classpath=\
66
${base}/junit/junit-3.8.2.jar
77
libs.junit.javadoc=\

‎nbproject/build-impl.xml

+53-57
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ is divided into following sections:
7979
<property file="nbproject/project.properties"/>
8080
</target>
8181
<target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
82+
<property name="platform.java" value="${java.home}/bin/java"/>
8283
<available file="${manifest.file}" property="manifest.available"/>
8384
<condition property="splashscreen.available">
8485
<and>
@@ -96,10 +97,11 @@ is divided into following sections:
9697
</not>
9798
</and>
9899
</condition>
99-
<condition property="manifest.available+main.class">
100+
<condition property="profile.available">
100101
<and>
101-
<isset property="manifest.available"/>
102-
<isset property="main.class.available"/>
102+
<isset property="javac.profile"/>
103+
<length length="0" string="${javac.profile}" when="greater"/>
104+
<matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
103105
</and>
104106
</condition>
105107
<condition property="do.archive">
@@ -116,12 +118,6 @@ is divided into following sections:
116118
</not>
117119
</and>
118120
</condition>
119-
<condition property="manifest.available+main.class+mkdist.available">
120-
<and>
121-
<istrue value="${manifest.available+main.class}"/>
122-
<isset property="do.mkdist"/>
123-
</and>
124-
</condition>
125121
<condition property="do.archive+manifest.available">
126122
<and>
127123
<isset property="manifest.available"/>
@@ -140,24 +136,12 @@ is divided into following sections:
140136
<istrue value="${do.archive}"/>
141137
</and>
142138
</condition>
143-
<condition property="do.archive+manifest.available+main.class">
139+
<condition property="do.archive+profile.available">
144140
<and>
145-
<istrue value="${manifest.available+main.class}"/>
141+
<isset property="profile.available"/>
146142
<istrue value="${do.archive}"/>
147143
</and>
148144
</condition>
149-
<condition property="manifest.available-mkdist.available">
150-
<or>
151-
<istrue value="${manifest.available}"/>
152-
<isset property="do.mkdist"/>
153-
</or>
154-
</condition>
155-
<condition property="manifest.available+main.class-mkdist.available">
156-
<or>
157-
<istrue value="${manifest.available+main.class}"/>
158-
<isset property="do.mkdist"/>
159-
</or>
160-
</condition>
161145
<condition property="have.tests">
162146
<or>
163147
<available file="${test.src.dir}"/>
@@ -211,7 +195,15 @@ is divided into following sections:
211195
</condition>
212196
<path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
213197
<condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
214-
<length length="0" string="${endorsed.classpath}" when="greater"/>
198+
<and>
199+
<isset property="endorsed.classpath"/>
200+
<not>
201+
<equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
202+
</not>
203+
</and>
204+
</condition>
205+
<condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
206+
<isset property="profile.available"/>
215207
</condition>
216208
<condition else="false" property="jdkBug6558476">
217209
<and>
@@ -300,6 +292,7 @@ is divided into following sections:
300292
<path path="@{classpath}"/>
301293
</classpath>
302294
<compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
295+
<compilerarg line="${javac.profile.cmd.line.arg}"/>
303296
<compilerarg line="${javac.compilerargs}"/>
304297
<compilerarg value="-processorpath"/>
305298
<compilerarg path="@{processorpath}:${empty.dir}"/>
@@ -339,6 +332,7 @@ is divided into following sections:
339332
<path path="@{classpath}"/>
340333
</classpath>
341334
<compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
335+
<compilerarg line="${javac.profile.cmd.line.arg}"/>
342336
<compilerarg line="${javac.compilerargs}"/>
343337
<customize/>
344338
</javac>
@@ -471,7 +465,7 @@ is divided into following sections:
471465
</fileset>
472466
</union>
473467
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
474-
<testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="LibLaserCut" testname="TestNG tests" workingDir="${work.dir}">
468+
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="LibLaserCut" testname="TestNG tests" workingDir="${work.dir}">
475469
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
476470
<propertyset>
477471
<propertyref prefix="test-sys-prop."/>
@@ -862,8 +856,8 @@ is divided into following sections:
862856
</chainedmapper>
863857
</pathconvert>
864858
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
865-
<copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
866-
<fileset dir="${build.classes.dir}"/>
859+
<copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
860+
<fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
867861
<manifest>
868862
<attribute name="Class-Path" value="${jar.classpath}"/>
869863
<customize/>
@@ -875,7 +869,7 @@ is divided into following sections:
875869
<target name="-init-presetdef-jar">
876870
<presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
877871
<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
878-
<j2seproject1:fileset dir="${build.classes.dir}"/>
872+
<j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
879873
</jar>
880874
</presetdef>
881875
</target>
@@ -991,65 +985,67 @@ is divided into following sections:
991985
<!-- Empty placeholder for easier customization. -->
992986
<!-- You can override this target in the ../build.xml file. -->
993987
</target>
994-
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
995-
<j2seproject1:jar/>
996-
</target>
997-
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
998-
<j2seproject1:jar manifest="${manifest.file}"/>
999-
</target>
1000-
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
1001-
<j2seproject1:jar manifest="${manifest.file}">
1002-
<j2seproject1:manifest>
1003-
<j2seproject1:attribute name="Main-Class" value="${main.class}"/>
1004-
</j2seproject1:manifest>
1005-
</j2seproject1:jar>
1006-
<echo level="info">To run this application from the command line without Ant, try:</echo>
1007-
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1008-
<property location="${dist.jar}" name="dist.jar.resolved"/>
1009-
<pathconvert property="run.classpath.with.dist.jar">
1010-
<path path="${run.classpath}"/>
1011-
<map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1012-
</pathconvert>
1013-
<echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
1014-
</target>
1015-
<target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
988+
<target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
1016989
<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1017990
<touch file="${tmp.manifest.file}" verbose="false"/>
1018991
</target>
1019-
<target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
992+
<target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
1020993
<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1021994
<copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
1022995
</target>
1023-
<target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
996+
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
1024997
<manifest file="${tmp.manifest.file}" mode="update">
1025998
<attribute name="Main-Class" value="${main.class}"/>
1026999
</manifest>
10271000
</target>
1028-
<target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
1001+
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
1002+
<manifest file="${tmp.manifest.file}" mode="update">
1003+
<attribute name="Profile" value="${javac.profile}"/>
1004+
</manifest>
1005+
</target>
1006+
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
10291007
<basename file="${application.splash}" property="splashscreen.basename"/>
10301008
<mkdir dir="${build.classes.dir}/META-INF"/>
10311009
<copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
10321010
<manifest file="${tmp.manifest.file}" mode="update">
10331011
<attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
10341012
</manifest>
10351013
</target>
1036-
<target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
1014+
<target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
10371015
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
10381016
<echo level="info">To run this application from the command line without Ant, try:</echo>
10391017
<property location="${dist.jar}" name="dist.jar.resolved"/>
10401018
<echo level="info">java -jar "${dist.jar.resolved}"</echo>
10411019
</target>
1042-
<target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
1020+
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
1021+
<j2seproject1:jar manifest="${tmp.manifest.file}"/>
1022+
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1023+
<property location="${dist.jar}" name="dist.jar.resolved"/>
1024+
<pathconvert property="run.classpath.with.dist.jar">
1025+
<path path="${run.classpath}"/>
1026+
<map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1027+
</pathconvert>
1028+
<condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
1029+
<isset property="main.class.available"/>
1030+
</condition>
1031+
<condition else="debug" property="jar.usage.level" value="info">
1032+
<isset property="main.class.available"/>
1033+
</condition>
1034+
<echo level="${jar.usage.level}" message="${jar.usage.message}"/>
1035+
</target>
1036+
<target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
10431037
<delete>
10441038
<fileset file="${tmp.manifest.file}"/>
10451039
</delete>
10461040
</target>
1047-
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
1041+
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
1042+
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
10481043
<target name="-post-jar">
10491044
<!-- Empty placeholder for easier customization. -->
10501045
<!-- You can override this target in the ../build.xml file. -->
10511046
</target>
1052-
<target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
1047+
<target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
1048+
<target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
10531049
<!--
10541050
=================
10551051
EXECUTION SECTION

‎nbproject/genfiles.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ [email protected]
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
66
nbproject/build-impl.xml.data.CRC32=25a416f2
7-
nbproject/build-impl.xml.script.CRC32=e9d551be
8-
nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
7+
nbproject/build-impl.xml.script.CRC32=e4d10b64
8+
nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46

‎src/com/t_oster/liblasercut/BlackWhiteRaster.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/**
22
* This file is part of LibLaserCut.
3-
* Copyright (C) 2011 - 2013 Thomas Oster <[email protected]>
4-
* RWTH Aachen University - 52062 Aachen, Germany
3+
* Copyright (C) 2011 - 2014 Thomas Oster <[email protected]>
54
*
6-
* LibLaserCut is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU Lesser General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
5+
* LibLaserCut is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU Lesser General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
109
*
11-
* LibLaserCut is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU Lesser General Public License for more details.
10+
* LibLaserCut is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU Lesser General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU Lesser General Public License
16+
* along with LibLaserCut. If not, see <http://www.gnu.org/licenses/>.
1517
*
16-
* You should have received a copy of the GNU Lesser General Public License
17-
* along with LibLaserCut. If not, see <http://www.gnu.org/licenses/>.
1818
**/
1919
package com.t_oster.liblasercut;
2020

0 commit comments

Comments
 (0)