| 1 |
#! /bin/sh /usr/share/dpatch/dpatch-run |
| 2 |
## 02_windows.dpatch by <gregor+debian@comodo.priv.at> |
| 3 |
## |
| 4 |
## All lines beginning with `## DP:' are a description of the patch. |
| 5 |
## DP: remove windows look |
| 6 |
|
| 7 |
@DPATCH@ |
| 8 |
diff -urNad libjgoodies-looks-java~/build.xml libjgoodies-looks-java/build.xml |
| 9 |
--- libjgoodies-looks-java~/build.xml 2006-12-25 20:13:31.000000000 +0100 |
| 10 |
+++ libjgoodies-looks-java/build.xml 2006-12-25 20:13:32.000000000 +0100 |
| 11 |
@@ -90,7 +90,7 @@ |
| 12 |
<!-- C O M P I L A T I O N --> |
| 13 |
<!-- ***************************************************************** --> |
| 14 |
<target name="compile" |
| 15 |
- depends="compile-core, compile-demo, compile-tests" |
| 16 |
+ depends="compile-core, compile-tests" |
| 17 |
description="Compiles the l&fs, demo, and tests." /> |
| 18 |
|
| 19 |
<!-- ***************************************************************** --> |
| 20 |
@@ -115,33 +115,11 @@ |
| 21 |
<copy toDir="${build.core.dir}" > |
| 22 |
<fileset dir="${src.core.dir}" |
| 23 |
includes="com/jgoodies/looks/common/shadow.png, |
| 24 |
- com/jgoodies/looks/plastic/icons/**/*, |
| 25 |
- com/jgoodies/looks/windows/icons/**/*" /> |
| 26 |
+ com/jgoodies/looks/plastic/icons/**/*" /> |
| 27 |
</copy> |
| 28 |
</target> |
| 29 |
|
| 30 |
<!-- ***************************************************************** --> |
| 31 |
- <target name="compile-demo" depends="compile-core" |
| 32 |
- description="Compiles the demo sources." > |
| 33 |
- <javac |
| 34 |
- srcdir ="${src.demo.dir}" |
| 35 |
- destdir ="${build.demo.dir}" |
| 36 |
- encoding ="${build.encoding}" |
| 37 |
- executable ="${build.compile.executable}" |
| 38 |
- fork ="${build.compile.fork}" |
| 39 |
- debug ="${build.compile.debug}" |
| 40 |
- depend ="${build.compile.depend}" |
| 41 |
- deprecation ="${build.compile.deprecation}" |
| 42 |
- nowarn ="${build.compile.nowarn}" |
| 43 |
- optimize ="${build.compile.optimize}" |
| 44 |
- source ="${build.compile.source}" |
| 45 |
- target ="${build.compile.target}" |
| 46 |
- verbose ="${build.compile.verbose}" |
| 47 |
- classpathref ="classpath.demo" /> |
| 48 |
- <!-- bootclasspath="${build.boot.classpath}" --> |
| 49 |
- </target> |
| 50 |
- |
| 51 |
- <!-- ***************************************************************** --> |
| 52 |
<target name="compile-tests" depends="compile-core" if="junit.jar.present" |
| 53 |
description="Compiles the unit tests." > |
| 54 |
<mkdir dir="${build.test.dir}"/> |
| 55 |
@@ -209,7 +187,7 @@ |
| 56 |
<!-- J A R --> |
| 57 |
<!-- ***************************************************************** --> |
| 58 |
<target name="jar" |
| 59 |
- depends="jar-all, jar-plastic, jar-windows, jar-demo, jar-tiny, jar-fonttest" |
| 60 |
+ depends="jar-all, jar-plastic, jar-demo, jar-tiny, jar-fonttest" |
| 61 |
description="Creates library and example jars." > |
| 62 |
</target> |
| 63 |
|
| 64 |
@@ -264,20 +242,6 @@ |
| 65 |
</target> |
| 66 |
|
| 67 |
<!-- ***************************************************************** --> |
| 68 |
- <target name="jar-windows" depends="compile, manifest" |
| 69 |
- description="Creates the library jar for the windows l&f." > |
| 70 |
- <jar |
| 71 |
- destfile="${build.windows.jar}" |
| 72 |
- manifest="${build.manifest}" > |
| 73 |
- <fileset dir="${build.core.dir}" |
| 74 |
- excludes="com/jgoodies/looks/plastic/**/*" /> |
| 75 |
- <zipfileset dir="${descriptors.dir}" |
| 76 |
- includes="windows.txt" |
| 77 |
- fullpath="META-INF/services/javax.swing.LookAndFeel" /> |
| 78 |
- </jar> |
| 79 |
- </target> |
| 80 |
- |
| 81 |
- <!-- ***************************************************************** --> |
| 82 |
<target name="jar-demo" depends="jar-plastic" |
| 83 |
description="Creates the demo jar." > |
| 84 |
<jar |
| 85 |
diff -urNad libjgoodies-looks-java~/src/core/com/jgoodies/looks/Options.java libjgoodies-looks-java/src/core/com/jgoodies/looks/Options.java |
| 86 |
--- libjgoodies-looks-java~/src/core/com/jgoodies/looks/Options.java 2006-12-25 19:59:21.000000000 +0100 |
| 87 |
+++ libjgoodies-looks-java/src/core/com/jgoodies/looks/Options.java 2006-12-25 20:14:29.000000000 +0100 |
| 88 |
@@ -38,8 +38,6 @@ |
| 89 |
|
| 90 |
import com.jgoodies.looks.common.ShadowPopup; |
| 91 |
import com.jgoodies.looks.plastic.PlasticLookAndFeel; |
| 92 |
-import com.jgoodies.looks.windows.WindowsLookAndFeel; |
| 93 |
-import com.sun.java.swing.plaf.windows.WindowsComboBoxUI; |
| 94 |
|
| 95 |
/** |
| 96 |
* Provides access to optional features of the JGoodies L&Fs |
Parent Directory
| 
Revision Log