/ org.eclipsetrader.releng / nebula-widgets-pshelf.patch
nebula-widgets-pshelf.patch
1 Index: .classpath 2 =================================================================== 3 RCS file: /cvsroot/technology/org.eclipse.swt.nebula/org.eclipse.nebula.widgets.pshelf/.classpath,v 4 retrieving revision 1.1 5 diff -u -r1.1 .classpath 6 --- .classpath 28 Mar 2007 17:39:30 -0000 1.1 7 +++ .classpath 29 Sep 2008 09:07:17 -0000 8 @@ -1,7 +1,7 @@ 9 <?xml version="1.0" encoding="UTF-8"?> 10 <classpath> 11 <classpathentry kind="src" path="src"/> 12 - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 13 + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> 14 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> 15 <classpathentry kind="output" path="bin"/> 16 </classpath> 17 Index: build.xml 18 =================================================================== 19 RCS file: build.xml 20 diff -N build.xml 21 --- build.xml 28 Mar 2007 17:40:31 -0000 1.1 22 +++ /dev/null 1 Jan 1970 00:00:00 -0000 23 @@ -1,158 +0,0 @@ 24 -<?xml version="1.0" encoding="UTF-8"?> 25 -<project name="org.eclipse.nebula.widgets.pshelf" default="build.jars" basedir="."> 26 - 27 - <property name="basews" value="${ws}"/> 28 - <property name="baseos" value="${os}"/> 29 - <property name="basearch" value="${arch}"/> 30 - <property name="basenl" value="${nl}"/> 31 - 32 - <!-- Compiler settings. --> 33 - <property name="javacFailOnError" value="false"/> 34 - <property name="javacDebugInfo" value="on"/> 35 - <property name="javacVerbose" value="false"/> 36 - <property name="logExtension" value=".log"/> 37 - <property name="compilerArg" value=""/> 38 - <property name="javacSource" value="1.3"/> 39 - <property name="javacTarget" value="1.2"/> 40 - <condition property="dir_bootclasspath" value="${java.home}/../Classes"> 41 - <os family="mac"/> 42 - </condition> 43 - <property name="dir_bootclasspath" value="${java.home}/lib"/> 44 - <path id="path_bootclasspath"> 45 - <fileset dir="${dir_bootclasspath}"> 46 - <include name="*.jar"/> 47 - </fileset> 48 - </path> 49 - <property name="bootclasspath" refid="path_bootclasspath"/> 50 - <property name="bundleJavacSource" value="${javacSource}"/> 51 - <property name="bundleJavacTarget" value="${javacTarget}"/> 52 - <property name="bundleBootClasspath" value="${bootclasspath}"/> 53 - 54 - <target name="init" depends="properties"> 55 - <condition property="pluginTemp" value="${buildTempFolder}/plugins"> 56 - <isset property="buildTempFolder"/> 57 - </condition> 58 - <property name="pluginTemp" value="${basedir}"/> 59 - <condition property="build.result.folder" value="${pluginTemp}/org.eclipse.nebula.widgets.pshelf"> 60 - <isset property="buildTempFolder"/> 61 - </condition> 62 - <property name="build.result.folder" value="${basedir}"/> 63 - <property name="temp.folder" value="${basedir}/temp.folder"/> 64 - <property name="plugin.destination" value="${basedir}"/> 65 - </target> 66 - 67 - <target name="properties" if="eclipse.running"> 68 - <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/> 69 - 70 - </target> 71 - 72 - <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.nebula.widgets.pshelf for an update site."> 73 - <delete dir="${temp.folder}"/> 74 - <mkdir dir="${temp.folder}"/> 75 - <antcall target="build.jars"/> 76 - <antcall target="gather.bin.parts"> 77 - <param name="destination.temp.folder" value="${temp.folder}/"/> 78 - </antcall> 79 - <zip destfile="${plugin.destination}/org.eclipse.nebula.widgets.pshelf_1.0.0.jar" basedir="${temp.folder}/org.eclipse.nebula.widgets.pshelf_1.0.0" filesonly="false" whenempty="skip" update="false"/> 80 - <delete dir="${temp.folder}"/> 81 - </target> 82 - 83 - <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.nebula.widgets.pshelf @dot."> 84 - <delete dir="${temp.folder}/@dot.bin"/> 85 - <mkdir dir="${temp.folder}/@dot.bin"/> 86 - <path id="@dot.classpath"> 87 - <pathelement path="../org.eclipse.swt/bin"/> 88 - <pathelement path="../org.eclipse.swt/@dot"/> 89 - <pathelement path="../../../../eclipse33m6/eclipse/plugins/org.eclipse.swt.win32.win32.x86_3.3.0.v3333.jar"/> 90 - </path> 91 - <!-- compile the source code --> 92 - <javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" > 93 - <compilerarg line="${compilerArg}" compiler="${build.compiler}"/> 94 - <classpath refid="@dot.classpath" /> 95 - <src path="src/" /> 96 - <compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/> 97 - <compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/> 98 - </javac> 99 - <!-- Copy necessary resources --> 100 - <copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false"> 101 - <fileset dir="src/" excludes="**/*.java, **/package.htm*" /> 102 - </copy> 103 - <mkdir dir="${build.result.folder}"/> 104 - <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false"> 105 - <fileset dir="${temp.folder}/@dot.bin" /> 106 - </copy> 107 - <delete dir="${temp.folder}/@dot.bin"/> 108 - </target> 109 - 110 - <target name="src.zip" depends="init" unless="src.zip"> 111 - <mkdir dir="${build.result.folder}"/> 112 - <zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false"> 113 - <fileset dir="src/" includes="**/*.java" /> 114 - </zip> 115 - </target> 116 - 117 - <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.nebula.widgets.pshelf."> 118 - <available property="@dot" file="${build.result.folder}/@dot"/> 119 - <antcall target="@dot"/> 120 - </target> 121 - 122 - <target name="build.sources" depends="init"> 123 - <available property="src.zip" file="${build.result.folder}/src.zip"/> 124 - <antcall target="src.zip"/> 125 - </target> 126 - 127 - <target name="gather.bin.parts" depends="init" if="destination.temp.folder"> 128 - <mkdir dir="${destination.temp.folder}/org.eclipse.nebula.widgets.pshelf_1.0.0"/> 129 - <copy todir="${destination.temp.folder}/org.eclipse.nebula.widgets.pshelf_1.0.0" failonerror="true" overwrite="false"> 130 - <fileset dir="${build.result.folder}/@dot" includes="**" /> 131 - </copy> 132 - <copy todir="${destination.temp.folder}/org.eclipse.nebula.widgets.pshelf_1.0.0" failonerror="true" overwrite="false"> 133 - <fileset dir="${basedir}" includes="META-INF/" /> 134 - </copy> 135 - </target> 136 - 137 - <target name="build.zips" depends="init"> 138 - </target> 139 - 140 - <target name="gather.sources" depends="init" if="destination.temp.folder"> 141 - <mkdir dir="${destination.temp.folder}/org.eclipse.nebula.widgets.pshelf_1.0.0"/> 142 - <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.nebula.widgets.pshelf_1.0.0" failonerror="false" overwrite="false"/> 143 - </target> 144 - 145 - <target name="gather.logs" depends="init" if="destination.temp.folder"> 146 - <mkdir dir="${destination.temp.folder}/org.eclipse.nebula.widgets.pshelf_1.0.0"/> 147 - <copy file="${temp.folder}/@dot.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.nebula.widgets.pshelf_1.0.0" failonerror="false" overwrite="false"/> 148 - </target> 149 - 150 - <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.nebula.widgets.pshelf of all the zips, jars and logs created."> 151 - <delete dir="${build.result.folder}/@dot"/> 152 - <delete file="${build.result.folder}/src.zip"/> 153 - <delete file="${plugin.destination}/org.eclipse.nebula.widgets.pshelf_1.0.0.jar"/> 154 - <delete file="${plugin.destination}/org.eclipse.nebula.widgets.pshelf_1.0.0.zip"/> 155 - <delete dir="${temp.folder}"/> 156 - </target> 157 - 158 - <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder."> 159 - <eclipse.convertPath fileSystemPath="C:/Documents and Settings/Administrator/workspace/org.eclipse.nebula.widgets.pshelf" property="resourcePath"/> 160 - <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/> 161 - </target> 162 - 163 - <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.nebula.widgets.pshelf."> 164 - <delete dir="${temp.folder}"/> 165 - <mkdir dir="${temp.folder}"/> 166 - <antcall target="build.jars"/> 167 - <antcall target="build.sources"/> 168 - <antcall target="gather.bin.parts"> 169 - <param name="destination.temp.folder" value="${temp.folder}/"/> 170 - </antcall> 171 - <antcall target="gather.sources"> 172 - <param name="destination.temp.folder" value="${temp.folder}/"/> 173 - </antcall> 174 - <delete> 175 - <fileset dir="${temp.folder}" includes="**/*.bin${logExtension}" /> 176 - </delete> 177 - <zip destfile="${plugin.destination}/org.eclipse.nebula.widgets.pshelf_1.0.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/> 178 - <delete dir="${temp.folder}"/> 179 - </target> 180 - 181 -</project> 182 Index: javaCompiler...args 183 =================================================================== 184 RCS file: javaCompiler...args 185 diff -N javaCompiler...args 186 --- javaCompiler...args 28 Mar 2007 17:40:31 -0000 1.1 187 +++ /dev/null 1 Jan 1970 00:00:00 -0000 188 @@ -1,3 +0,0 @@ 189 -#ADAPTER#ACCESS#org.eclipse.swt/bin[+org/eclipse/swt/*;+org/eclipse/swt/accessibility/*;+org/eclipse/swt/awt/*;+org/eclipse/swt/browser/*;+org/eclipse/swt/custom/*;+org/eclipse/swt/dnd/*;+org/eclipse/swt/events/*;+org/eclipse/swt/graphics/*;+org/eclipse/swt/layout/*;+org/eclipse/swt/opengl/*;+org/eclipse/swt/printing/*;+org/eclipse/swt/program/*;+org/eclipse/swt/widgets/*;~org/eclipse/swt/internal/*;~org/eclipse/swt/internal/image/*;~org/eclipse/swt/internal/theme/*;+org/eclipse/swt/ole/win32/*;~org/eclipse/swt/internal/gdip/*;~org/eclipse/swt/internal/ole/win32/*;~org/eclipse/swt/internal/win32/*;~org/eclipse/swt/internal/opengl/win32/*;?**/*] 190 -#ADAPTER#ACCESS#org.eclipse.swt/@dot[+org/eclipse/swt/*;+org/eclipse/swt/accessibility/*;+org/eclipse/swt/awt/*;+org/eclipse/swt/browser/*;+org/eclipse/swt/custom/*;+org/eclipse/swt/dnd/*;+org/eclipse/swt/events/*;+org/eclipse/swt/graphics/*;+org/eclipse/swt/layout/*;+org/eclipse/swt/opengl/*;+org/eclipse/swt/printing/*;+org/eclipse/swt/program/*;+org/eclipse/swt/widgets/*;~org/eclipse/swt/internal/*;~org/eclipse/swt/internal/image/*;~org/eclipse/swt/internal/theme/*;+org/eclipse/swt/ole/win32/*;~org/eclipse/swt/internal/gdip/*;~org/eclipse/swt/internal/ole/win32/*;~org/eclipse/swt/internal/win32/*;~org/eclipse/swt/internal/opengl/win32/*;?**/*] 191 -#ADAPTER#ACCESS#eclipse/plugins/org.eclipse.swt.win32.win32.x86_3.3.0.v3333.jar[+org/eclipse/swt/*;+org/eclipse/swt/accessibility/*;+org/eclipse/swt/awt/*;+org/eclipse/swt/browser/*;+org/eclipse/swt/custom/*;+org/eclipse/swt/dnd/*;+org/eclipse/swt/events/*;+org/eclipse/swt/graphics/*;+org/eclipse/swt/layout/*;+org/eclipse/swt/opengl/*;+org/eclipse/swt/printing/*;+org/eclipse/swt/program/*;+org/eclipse/swt/widgets/*;~org/eclipse/swt/internal/*;~org/eclipse/swt/internal/image/*;~org/eclipse/swt/internal/theme/*;+org/eclipse/swt/ole/win32/*;~org/eclipse/swt/internal/gdip/*;~org/eclipse/swt/internal/ole/win32/*;~org/eclipse/swt/internal/win32/*;~org/eclipse/swt/internal/opengl/win32/*;?**/*] 192 Index: META-INF/MANIFEST.MF 193 =================================================================== 194 RCS file: /cvsroot/technology/org.eclipse.swt.nebula/org.eclipse.nebula.widgets.pshelf/META-INF/MANIFEST.MF,v 195 retrieving revision 1.2 196 diff -u -r1.2 MANIFEST.MF 197 --- META-INF/MANIFEST.MF 3 May 2007 16:10:39 -0000 1.2 198 +++ META-INF/MANIFEST.MF 29 Sep 2008 09:07:17 -0000 199 @@ -6,3 +6,4 @@ 200 Bundle-Vendor: Eclipse.org 201 Require-Bundle: org.eclipse.swt 202 Export-Package: org.eclipse.nebula.widgets.pshelf 203 +Bundle-RequiredExecutionEnvironment: J2SE-1.4 204 Index: src/org/eclipse/nebula/widgets/pshelf/PShelf.java 205 =================================================================== 206 RCS file: /cvsroot/technology/org.eclipse.swt.nebula/org.eclipse.nebula.widgets.pshelf/src/org/eclipse/nebula/widgets/pshelf/PShelf.java,v 207 retrieving revision 1.4 208 diff -u -r1.4 PShelf.java 209 --- src/org/eclipse/nebula/widgets/pshelf/PShelf.java 19 Oct 2007 17:47:39 -0000 1.4 210 +++ src/org/eclipse/nebula/widgets/pshelf/PShelf.java 29 Sep 2008 09:07:18 -0000 211 @@ -416,10 +416,11 @@ 212 redraw(); 213 update(); 214 //workaround for SWT bug 193357 215 - if (SWT.getPlatform().equals("carbon")) 216 + /*if (SWT.getPlatform().equals("carbon")) 217 { 218 getDisplay().readAndDispatch(); 219 - } 220 + }*/ 221 + while(getDisplay().readAndDispatch()); 222 percentOfWork += .02; 223 } 224 225 @@ -472,13 +473,14 @@ 226 } 227 228 sizeClients(); 229 - redraw(getClientArea().x,getClientArea().y, getClientArea().width, getClientArea().height, false); 230 + redraw(); 231 update(); 232 //workaround for SWT bug 193357 233 - if (SWT.getPlatform().equals("carbon")) 234 + /*if (SWT.getPlatform().equals("carbon")) 235 { 236 getDisplay().readAndDispatch(); 237 - } 238 + }*/ 239 + while(getDisplay().readAndDispatch()); 240 percentOfWork += .02; 241 } 242