| 0 | |
Index: findbugs-2.0.3/build.properties
|
| 1 | |
===================================================================
|
| 2 | |
--- findbugs-2.0.3.orig/build.properties 2013-12-17 19:44:08.738200004 +0800
|
| 3 | |
+++ findbugs-2.0.3/build.properties 2013-12-17 19:51:27.826196570 +0800
|
|
0 |
unchanged:
|
|
1 |
--- a/build.properties
|
|
2 |
+++ b/build.properties
|
| 4 | 3 |
@@ -8,10 +8,12 @@
|
| 5 | 4 |
src/gui/,\
|
| 6 | 5 |
etc
|
|
| 24 | 23 |
|
| 25 | 24 |
# Set this to the directory where FOP (http://xml.apache.org/fop/)
|
| 26 | 25 |
# is installed. (Note: this is disabled for now.)
|
| 27 | |
Index: findbugs-2.0.3/build.xml
|
| 28 | |
===================================================================
|
| 29 | |
--- findbugs-2.0.3.orig/build.xml 2013-12-17 19:44:08.738200004 +0800
|
| 30 | |
+++ findbugs-2.0.3/build.xml 2013-12-17 19:51:27.830196570 +0800
|
| 31 | |
@@ -60,24 +60,23 @@
|
| 32 | |
<property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
|
|
26 |
--- a/build.xml
|
|
27 |
+++ b/build.xml
|
|
28 |
@@ -60,12 +60,24 @@
|
| 33 | 29 |
|
| 34 | 30 |
<path id="findbugs.classpath">
|
| 35 | |
- <pathelement location="${jar.dir}/bcel.jar"/>
|
| 36 | |
- <pathelement location="${jar.dir}/dom4j-1.6.1.jar"/>
|
| 37 | |
- <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/>
|
| 38 | |
- <pathelement location="${jar.dir}/junit.jar"/>
|
| 39 | |
- <pathelement location="${jar.dir}/asm-3.3.jar"/>
|
| 40 | |
- <pathelement location="${jar.dir}/asm-commons-3.3.jar"/>
|
| 41 | |
- <pathelement location="${jar.dir}/asm-tree-3.3.jar"/>
|
| 42 | |
- <pathelement location="${jar.dir}/jaxen-1.1.6.jar"/>
|
| 43 | |
- <pathelement location="${jar.dir}/jsr305.jar"/>
|
| 44 | |
- <pathelement location="${jar.dir}/jFormatString.jar"/>
|
| 45 | |
- <pathelement location="${jar.dir}/commons-lang-2.6.jar"/>
|
| 46 | |
- <pathelement location="${jar.dir}/jcip-annotations.jar"/>
|
|
31 |
<fileset dir="${jar.dir}" includes="*.jar"/>
|
| 47 | 32 |
+ <pathelement location="${sys.jar.dir}/bcel.jar"/>
|
|
33 |
+ <pathelement location="${sys.jar.dir}/commons-lang.jar"/>
|
|
34 |
+ <pathelement location="${sys.jar.dir}/jsr305.jar"/>
|
|
35 |
+ <pathelement location="${sys.jar.dir}/junit4.jar"/>
|
| 48 | 36 |
+ <pathelement location="${sys.jar.dir}/dom4j.jar"/>
|
| 49 | |
+ <pathelement location="${sys.jar.dir}/junit4.jar"/>
|
| 50 | |
+ <pathelement location="${sys.jar.dir}/asm3.jar"/>
|
| 51 | |
+ <pathelement location="${sys.jar.dir}/asm3-commons.jar"/>
|
| 52 | |
+ <pathelement location="${sys.jar.dir}/asm3-tree.jar"/>
|
| 53 | |
+ <pathelement location="${sys.jar.dir}/jaxen.jar"/>
|
| 54 | |
+ <pathelement location="${sys.jar.dir}/jsr305.jar"/>
|
|
37 |
+ <pathelement location="${sys.jar.dir}/jdepend.jar"/>
|
| 55 | 38 |
+ <pathelement location="${sys.jar.dir}/jFormatString.jar"/>
|
| 56 | |
+ <pathelement location="${sys.jar.dir}/commons-lang.jar"/>
|
|
39 |
+ <pathelement location="${sys.jar.dir}/asm4.jar"/>
|
|
40 |
+ <pathelement location="${sys.jar.dir}/asm4-commons.jar"/>
|
|
41 |
+ <pathelement location="${sys.jar.dir}/asm4-tree.jar"/>
|
| 57 | 42 |
+ <pathelement location="${sys.jar.dir}/jcip.jar"/>
|
|
43 |
+ <pathelement location="${sys.jar.dir}/ant.jar"/>
|
| 58 | 44 |
</path>
|
| 59 | 45 |
|
| 60 | 46 |
<path id="tools.classpath">
|
|
| 65 | 51 |
<path refid="findbugs.classpath"/>
|
| 66 | 52 |
</path>
|
| 67 | 53 |
|
| 68 | |
@@ -124,17 +123,16 @@
|
| 69 | |
<target name="mondo" depends="jars">
|
| 70 | |
<jar destfile="build/mondo.jar"
|
| 71 | |
manifest="etc/MANIFEST-findbugs-mondo.MF">
|
| 72 | |
- <zipfileset src="${jar.dir}/bcel.jar"/>
|
| 73 | |
- <zipfileset src="${jar.dir}/dom4j-1.6.1.jar"/>
|
| 74 | |
- <zipfileset src="${jar.dir}/AppleJavaExtensions.jar"/>
|
| 75 | |
- <zipfileset src="${jar.dir}/junit.jar"/>
|
| 76 | |
- <zipfileset src="${jar.dir}/asm-3.3.jar"/>
|
| 77 | |
- <zipfileset src="${jar.dir}/asm-commons-3.3.jar"/>
|
| 78 | |
- <zipfileset src="${jar.dir}/asm-tree-3.3.jar"/>
|
| 79 | |
- <zipfileset src="${jar.dir}/jaxen-1.1.6.jar"/>
|
| 80 | |
- <zipfileset src="${jar.dir}/jsr305.jar"/>
|
| 81 | |
- <zipfileset src="${jar.dir}/jFormatString.jar"/>
|
| 82 | |
- <zipfileset src="${jar.dir}/commons-lang-2.6.jar"/>
|
| 83 | |
+ <zipfileset src="${sys.jar.dir}/bcel.jar"/>
|
| 84 | |
+ <zipfileset src="${sys.jar.dir}/dom4j.jar"/>
|
| 85 | |
+ <zipfileset src="${sys.jar.dir}/junit4.jar"/>
|
| 86 | |
+ <zipfileset src="${sys.jar.dir}/asm3.jar"/>
|
| 87 | |
+ <zipfileset src="${sys.jar.dir}/asm3-commons.jar"/>
|
| 88 | |
+ <zipfileset src="${sys.jar.dir}/asm3-tree.jar"/>
|
| 89 | |
+ <zipfileset src="${sys.jar.dir}/jaxen.jar"/>
|
| 90 | |
+ <zipfileset src="${sys.jar.dir}/jsr305.jar"/>
|
| 91 | |
+ <zipfileset src="${sys.jar.dir}/jFormatString.jar"/>
|
| 92 | |
+ <zipfileset src="${sys.jar.dir}/commons-lang.jar"/>
|
| 93 | |
<zipfileset src="${jar.dir}/findbugs.jar"/>
|
| 94 | |
</jar>
|
| 95 | |
</target>
|
| 96 | |
@@ -329,8 +327,8 @@
|
|
54 |
@@ -298,8 +310,8 @@
|
| 97 | 55 |
<fileset dir="${src.dir}">
|
| 98 | 56 |
<include name="**/annotations/*.java"/>
|
| 99 | 57 |
</fileset>
|
|
| 104 | 62 |
</jar>
|
| 105 | 63 |
</target>
|
| 106 | 64 |
|
| 107 | |
@@ -362,20 +360,20 @@
|
| 108 | |
<include name="messages*.xml"/>
|
| 109 | |
</fileset>
|
| 110 | |
|
| 111 | |
- <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/>
|
| 112 | |
+ <zipfileset src="${sys.jar.dir}/bcel.jar" excludes="META-INF/**"/>
|
| 113 | |
|
| 114 | |
- <zipfileset src="${jar.dir}/asm-3.3.jar" excludes="META-INF/**"/>
|
| 115 | |
- <zipfileset src="${jar.dir}/asm-analysis-3.3.jar" excludes="META-INF/**"/>
|
| 116 | |
- <zipfileset src="${jar.dir}/asm-commons-3.3.jar" excludes="META-INF/**"/>
|
| 117 | |
- <zipfileset src="${jar.dir}/asm-tree-3.3.jar" excludes="META-INF/**"/>
|
| 118 | |
- <zipfileset src="${jar.dir}/asm-util-3.3.jar" excludes="META-INF/**"/>
|
| 119 | |
- <zipfileset src="${jar.dir}/asm-xml-3.3.jar" excludes="META-INF/**"/>
|
| 120 | |
-
|
| 121 | |
- <zipfileset src="${jar.dir}/dom4j-1.6.1.jar" excludes="META-INF/**"/>
|
| 122 | |
- <zipfileset src="${jar.dir}/jaxen-1.1.6.jar" excludes="META-INF/**"/>
|
| 123 | |
- <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**"/>
|
| 124 | |
- <zipfileset src="${jar.dir}/jFormatString.jar" excludes="META-INF/**"/>
|
| 125 | |
- <zipfileset src="${jar.dir}/commons-lang-2.6.jar" excludes="META-INF/**"/>
|
| 126 | |
+ <zipfileset src="${sys.jar.dir}/asm3.jar" excludes="META-INF/**"/>
|
| 127 | |
+ <zipfileset src="${sys.jar.dir}/asm3-analysis.jar" excludes="META-INF/**"/>
|
| 128 | |
+ <zipfileset src="${sys.jar.dir}/asm3-commons.jar" excludes="META-INF/**"/>
|
| 129 | |
+ <zipfileset src="${sys.jar.dir}/asm3-tree.jar" excludes="META-INF/**"/>
|
| 130 | |
+ <zipfileset src="${sys.jar.dir}/asm3-util.jar" excludes="META-INF/**"/>
|
| 131 | |
+ <zipfileset src="${sys.jar.dir}/asm3-xml.jar" excludes="META-INF/**"/>
|
| 132 | |
+
|
| 133 | |
+ <zipfileset src="${sys.jar.dir}/dom4j.jar" excludes="META-INF/**"/>
|
| 134 | |
+ <zipfileset src="${sys.jar.dir}/jaxen.jar" excludes="META-INF/**"/>
|
| 135 | |
+ <zipfileset src="${sys.jar.dir}/jsr305.jar" excludes="META-INF/**"/>
|
| 136 | |
+ <zipfileset src="${sys.jar.dir}/jFormatString.jar" excludes="META-INF/**"/>
|
| 137 | |
+ <zipfileset src="${sys.jar.dir}/commons-lang.jar" excludes="META-INF/**"/>
|
| 138 | |
</jar>
|
|
65 |
@@ -645,14 +657,12 @@
|
| 139 | 66 |
</target>
|
| 140 | 67 |
|
| 141 | |
@@ -511,7 +509,7 @@
|
| 142 | |
projectName="Byte code Engineering Library (BCEL)"
|
| 143 | |
outputFile="${sampleoutput.dir}/bcel.xml"
|
| 144 | |
>
|
| 145 | |
- <class location="${jar.dir}/bcel.jar" />
|
| 146 | |
+ <class location="${sys.jar.dir}/bcel.jar" />
|
| 147 | |
</findbugs>
|
| 148 | |
<findbugs home="."
|
| 149 | |
output="xml:withMessages"
|
| 150 | |
@@ -519,7 +517,7 @@
|
| 151 | |
jvmargs="-ea -Xmx1200m"
|
| 152 | |
projectName="Byte code Engineering Library (BCEL)"
|
| 153 | |
outputFile="${sampleoutput.dir}/bcel-cloud-appengine.xml" >
|
| 154 | |
- <class location="${jar.dir}/bcel.jar" />
|
| 155 | |
+ <class location="${jar.dir}/bcel.jar" />
|
| 156 | |
</findbugs>
|
| 157 | |
<!--
|
| 158 | |
<findbugs home="."
|
| 159 | |
@@ -1029,16 +1027,15 @@
|
|
68 |
|
|
69 |
- <target name="version" depends="classes,-get-git-revision" >
|
|
70 |
- <echo>${gitrnum}</echo>
|
|
71 |
+ <target name="version" depends="classes" >
|
|
72 |
<java classpathref="tools.classpath"
|
|
73 |
output="${version.props.file}"
|
|
74 |
classname="edu.umd.cs.findbugs.Version"
|
|
75 |
failonerror="true">
|
|
76 |
<arg value="-props"/>
|
|
77 |
- <sysproperty key="git.revision" value="${gitrnum}"/>
|
|
78 |
</java>
|
|
79 |
|
|
80 |
<loadproperties srcfile="${version.props.file}"/>
|
|
81 |
@@ -943,16 +953,15 @@
|
| 160 | 82 |
<!-- Generate jnlp jars -->
|
| 161 | 83 |
<target name="jnlp" depends="jars">
|
| 162 | 84 |
<copy todir="${jnlp.dir}" file="${engine.jar}"/>
|
|
| 172 | 94 |
- <copy todir="${jnlp.dir}" file="${jar.dir}/AppleJavaExtensions.jar"/>
|
| 173 | 95 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/bcel.jar"/>
|
| 174 | 96 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jsr305.jar"/>
|
| 175 | |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/>
|
| 176 | |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/>
|
| 177 | |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-tree.jar"/>
|
|
97 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm4.jar"/>
|
|
98 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm4-commons.jar"/>
|
|
99 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm4-tree.jar"/>
|
| 178 | 100 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/dom4j.jar"/>
|
| 179 | 101 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jaxen.jar"/>
|
| 180 | 102 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jFormatString.jar"/>
|
|
| 182 | 104 |
<copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/>
|
| 183 | 105 |
<copy todir="${jnlp.dir}">
|
| 184 | 106 |
<fileset refid="plugin.jars"/>
|
| 185 | |
@@ -1310,7 +1307,7 @@
|
|
107 |
@@ -1212,7 +1221,7 @@
|
| 186 | 108 |
|
| 187 | 109 |
<target name="annotationJavadoc">
|
| 188 | 110 |
<javadoc access="public"
|
| 189 | 111 |
- classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
|
| 190 | |
+ classpath="${sys.jar.dir}/bcel.jar:${sys.jar.dir}/junit4.jar:${sys.jar.dir}/dom4j.jar:${sys.jar.dir}/jsr305.jar"
|
|
112 |
+ classpath="${sys.jar.dir}/findbugs-bcel.jar:${sys.jar.dir}/junit4.jar:${sys.jar.dir}/dom4j.jar:${sys.jar.dir}/jsr305.jar"
|
| 191 | 113 |
destdir="${annotationDoc.dir}"
|
| 192 | 114 |
packagenames="edu.umd.cs.findbugs.annotations"
|
| 193 | 115 |
doctitle="FindBugs Annotation Documentation"
|
| 194 | |
Index: findbugs-2.0.3/.classpath
|
| 195 | |
===================================================================
|
| 196 | |
--- findbugs-2.0.3.orig/.classpath 2013-12-17 19:51:22.710196610 +0800
|
| 197 | |
+++ findbugs-2.0.3/.classpath 2013-12-17 20:10:22.934187697 +0800
|
| 198 | |
@@ -15,32 +15,19 @@
|
| 199 | |
<accessrule kind="nonaccessible" pattern="com/apple/**"/>
|
| 200 | |
</accessrules>
|
| 201 | |
</classpathentry>
|
| 202 | |
- <classpathentry exported="true" kind="lib" path="lib/AppleJavaExtensions.jar"/>
|
| 203 | |
- <classpathentry exported="true" kind="lib" path="lib/bcel.jar">
|
| 204 | |
- <attributes>
|
| 205 | |
- <attribute name="javadoc_location" value="http://jakarta.apache.org/bcel/apidocs/"/>
|
| 206 | |
- </attributes>
|
| 207 | |
- </classpathentry>
|
| 208 | |
- <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar">
|
| 209 | |
- <attributes>
|
| 210 | |
- <attribute name="javadoc_location" value="http://dom4j.org/apidocs/"/>
|
| 211 | |
- </attributes>
|
| 212 | |
- </classpathentry>
|
| 213 | |
- <classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
|
| 214 | |
- <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
|
| 215 | |
- <classpathentry exported="true" kind="lib" path="lib/jcip-annotations.jar"/>
|
| 216 | |
- <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist.jar"/>
|
| 217 | |
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
| 218 | |
- <classpathentry exported="true" kind="lib" path="lib/jsr305.jar" sourcepath="lib/jsr305.jar"/>
|
| 219 | |
- <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
|
| 220 | |
- <classpathentry exported="true" kind="lib" path="lib/jFormatString.jar"/>
|
| 221 | |
- <classpathentry exported="true" kind="lib" path="lib/jdepend-2.9.jar"/>
|
| 222 | |
- <classpathentry exported="true" kind="lib" path="lib/asm-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
|
| 223 | |
- <classpathentry exported="true" kind="lib" path="lib/asm-commons-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
|
| 224 | |
- <classpathentry exported="true" kind="lib" path="lib/asm-tree-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
|
| 225 | |
- <classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
|
| 226 | |
- <classpathentry exported="true" kind="lib" path="lib/asm-analysis-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
|
| 227 | |
- <classpathentry exported="true" kind="lib" path="lib/asm-util-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
|
| 228 | |
- <classpathentry exported="true" kind="lib" path="lib/asm-xml-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
|
| 229 | |
+ <classpathentry kind="lib" path="/usr/share/java/junit4.jar"/>
|
| 230 | |
+ <classpathentry kind="lib" path="/usr/share/java/asm3.jar"/>
|
| 231 | |
+ <classpathentry kind="lib" path="/usr/share/java/asm3-tree.jar"/>
|
| 232 | |
+ <classpathentry kind="lib" path="/usr/share/java/bcel.jar"/>
|
| 233 | |
+ <classpathentry kind="lib" path="/usr/share/java/dom4j.jar"/>
|
| 234 | |
+ <classpathentry kind="lib" path="/usr/share/java/asm3-commons.jar"/>
|
| 235 | |
+ <classpathentry kind="lib" path="/usr/share/java/jaxen.jar"/>
|
| 236 | |
+ <classpathentry kind="lib" path="/usr/share/java/jsr305.jar"/>
|
| 237 | |
+ <classpathentry kind="lib" path="/usr/share/java/jFormatString.jar"/>
|
| 238 | |
+ <classpathentry kind="lib" path="/usr/share/java/commons-lang.jar"/>
|
| 239 | |
+ <classpathentry kind="lib" path="/usr/share/java/jcip.jar"/>
|
| 240 | |
+ <classpathentry kind="lib" path="/usr/share/java/ant.jar"/>
|
| 241 | |
+ <classpathentry kind="lib" path="/usr/share/java/jdepend.jar"/>
|
| 242 | |
<classpathentry kind="output" path="classesEclipse"/>
|
| 243 | |
</classpath>
|
| 244 | |
Index: findbugs-2.0.3/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
|
| 245 | |
===================================================================
|
| 246 | |
--- findbugs-2.0.3.orig/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java 2010-09-18 15:46:28.000000000 +0800
|
| 247 | |
+++ findbugs-2.0.3/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java 2013-12-17 20:04:48.778190308 +0800
|
|
116 |
--- a/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
|
|
117 |
+++ b/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
|
| 248 | 118 |
@@ -19,9 +19,6 @@
|
| 249 | 119 |
|
| 250 | 120 |
package edu.umd.cs.findbugs.gui2;
|
|
| 255 | 125 |
/*
|
| 256 | 126 |
* Based on sample code from Apple.
|
| 257 | 127 |
*
|
| 258 | |
@@ -29,91 +26,8 @@
|
|
128 |
@@ -29,13 +26,13 @@
|
| 259 | 129 |
* This class should only ever be referenced via reflection after
|
| 260 | 130 |
* checking that we are running on Mac OS X.
|
| 261 | 131 |
*/
|
| 262 | 132 |
-public class OSXAdapter extends ApplicationAdapter {
|
| 263 | |
-
|
| 264 | |
- // pseudo-singleton model; no point in making multiple instances
|
| 265 | |
- // of the EAWT application or our adapter
|
| 266 | |
- private static OSXAdapter theAdapter = new OSXAdapter();
|
| 267 | |
-
|
|
133 |
+public class OSXAdapter {
|
|
134 |
|
|
135 |
// pseudo-singleton model; no point in making multiple instances
|
|
136 |
// of the EAWT application or our adapter
|
|
137 |
private static OSXAdapter theAdapter = new OSXAdapter();
|
|
138 |
|
| 268 | 139 |
- private static final com.apple.eawt.Application theApplication = new com.apple.eawt.Application();
|
| 269 | |
-
|
| 270 | |
- // reference to the app where the existing quit, about, prefs code is
|
| 271 | |
- private static MainFrame mainApp;
|
| 272 | |
-
|
| 273 | |
- private OSXAdapter() {
|
| 274 | |
- }
|
| 275 | |
-
|
| 276 | |
- // implemented handler methods. These are basically hooks into
|
| 277 | |
- // existing functionality from the main app, as if it came
|
| 278 | |
- // over from another platform.
|
| 279 | |
-
|
| 280 | |
- @Override
|
| 281 | |
- public void handleAbout(ApplicationEvent ae) {
|
| 282 | |
- if (mainApp != null) {
|
| 283 | |
- ae.setHandled(true);
|
| 284 | |
- // We need to invoke modal About Dialog asynchronously
|
| 285 | |
- // otherwise the Application queue is locked for the duration
|
| 286 | |
- // of the about Dialog, which results in a deadlock if a URL is
|
| 287 | |
- // selected, and we get a ReOpenApplication event when user
|
| 288 | |
- // switches back to Findbugs.
|
| 289 | |
- javax.swing.SwingUtilities.invokeLater(new Runnable() {
|
| 290 | |
- public void run() {
|
| 291 | |
- mainApp.about();
|
| 292 | |
- }
|
| 293 | |
- });
|
| 294 | |
- } else {
|
| 295 | |
- throw new IllegalStateException("handleAbout: " + "MyApp instance detached from listener");
|
| 296 | |
- }
|
| 297 | |
- }
|
| 298 | |
-
|
| 299 | |
- @Override
|
| 300 | |
- public void handlePreferences(ApplicationEvent ae) {
|
| 301 | |
- if (mainApp != null) {
|
| 302 | |
- mainApp.preferences();
|
| 303 | |
- ae.setHandled(true);
|
| 304 | |
- } else {
|
| 305 | |
- throw new IllegalStateException("handlePreferences: MyApp instance " + "detached from listener");
|
| 306 | |
- }
|
| 307 | |
- }
|
| 308 | |
-
|
|
140 |
+ //private static final com.apple.eawt.Application theApplication = new com.apple.eawt.Application();
|
|
141 |
|
|
142 |
// reference to the app where the existing quit, about, prefs code is
|
|
143 |
private static MainFrame mainApp;
|
|
144 |
@@ -47,6 +44,7 @@
|
|
145 |
// existing functionality from the main app, as if it came
|
|
146 |
// over from another platform.
|
|
147 |
|
|
148 |
+ /* disabled for Debian build
|
|
149 |
@Override
|
|
150 |
public void handleAbout(ApplicationEvent ae) {
|
|
151 |
if (mainApp != null) {
|
|
152 |
@@ -76,10 +74,12 @@
|
|
153 |
throw new IllegalStateException("handlePreferences: MyApp instance " + "detached from listener");
|
|
154 |
}
|
|
155 |
}
|
|
156 |
+ */
|
|
157 |
|
| 309 | 158 |
- @Override
|
| 310 | 159 |
- public void handleQuit(ApplicationEvent ae) {
|
| 311 | 160 |
- if (mainApp != null) {
|
| 312 | |
-
|
| 313 | |
- /*
|
| 314 | |
- * You MUST setHandled(false) if you want to delay or cancel the
|
| 315 | |
- * quit. This is important for cross-platform development -- have a
|
| 316 | |
- * universal quit routine that chooses whether or not to quit, so
|
| 317 | |
- * the functionality is identical on all platforms. This example
|
| 318 | |
- * simply cancels the AppleEvent-based quit and defers to that
|
| 319 | |
- * universal method.
|
| 320 | |
- */
|
| 321 | |
-
|
|
161 |
+ // disabled for Debian build
|
|
162 |
+ //@Override
|
|
163 |
+ //public void handleQuit(ApplicationEvent ae) {
|
|
164 |
+ // if (mainApp != null) {
|
|
165 |
|
|
166 |
/*
|
|
167 |
* You MUST setHandled(false) if you want to delay or cancel the
|
|
168 |
@@ -90,12 +90,12 @@
|
|
169 |
* universal method.
|
|
170 |
*/
|
|
171 |
|
| 322 | 172 |
- ae.setHandled(false);
|
| 323 | 173 |
- mainApp.callOnClose();
|
| 324 | 174 |
- } else {
|
| 325 | 175 |
- throw new IllegalStateException("handleQuit: MyApp instance detached " + "from listener");
|
| 326 | 176 |
- }
|
| 327 | 177 |
- }
|
| 328 | |
-
|
| 329 | |
- // The main entry-point for this functionality. This is the only method
|
| 330 | |
- // that needs to be called at runtime, and it can easily be done using
|
| 331 | |
- // reflection (see MyApp.java)
|
| 332 | |
- public static void registerMacOSXApplication(MainFrame inApp) {
|
| 333 | |
- if (mainApp != null)
|
| 334 | |
- throw new IllegalStateException("application already set");
|
| 335 | |
-
|
| 336 | |
- mainApp = inApp;
|
| 337 | |
-
|
|
178 |
+ // ae.setHandled(false);
|
|
179 |
+ // mainApp.callOnClose();
|
|
180 |
+ // } else {
|
|
181 |
+ // throw new IllegalStateException("handleQuit: MyApp instance detached " + "from listener");
|
|
182 |
+ // }
|
|
183 |
+ //}
|
|
184 |
|
|
185 |
// The main entry-point for this functionality. This is the only method
|
|
186 |
// that needs to be called at runtime, and it can easily be done using
|
|
187 |
@@ -107,15 +107,15 @@
|
|
188 |
|
|
189 |
mainApp = inApp;
|
|
190 |
|
| 338 | 191 |
- theApplication.addApplicationListener(theAdapter);
|
| 339 | |
-
|
|
192 |
+ //theApplication.addApplicationListener(theAdapter);
|
|
193 |
|
| 340 | 194 |
- theApplication.addPreferencesMenuItem();
|
| 341 | |
- }
|
| 342 | |
-
|
| 343 | |
- // Another static entry point for EAWT functionality. Enables the
|
| 344 | |
- // "Preferences..." menu item in the application menu.
|
| 345 | |
- public static void enablePrefs(boolean enabled) {
|
| 346 | |
-
|
|
195 |
+ //theApplication.addPreferencesMenuItem();
|
|
196 |
}
|
|
197 |
|
|
198 |
// Another static entry point for EAWT functionality. Enables the
|
|
199 |
// "Preferences..." menu item in the application menu.
|
|
200 |
public static void enablePrefs(boolean enabled) {
|
|
201 |
|
| 347 | 202 |
- theApplication.setEnabledPreferencesMenu(enabled);
|
| 348 | |
+public class OSXAdapter {
|
| 349 | |
+ public OSXAdapter() throws Exception {
|
| 350 | |
+ throw new Exception("No support for apple in debian.");
|
|
203 |
+ //theApplication.setEnabledPreferencesMenu(enabled);
|
| 351 | 204 |
}
|
| 352 | 205 |
}
|
|
206 |
--- a/src/gui/edu/umd/cs/findbugs/gui2/MainFrameComponentFactory.java
|
|
207 |
+++ b/src/gui/edu/umd/cs/findbugs/gui2/MainFrameComponentFactory.java
|
|
208 |
@@ -461,7 +461,7 @@
|
|
209 |
JToolTip tempToolTip = mainFrame.mainFrameTree.getTableheader().createToolTip();
|
|
210 |
UIManager.put("ToolTip.font", new FontUIResource(tempToolTip.getFont().deriveFont(Driver.getFontSize())));
|
|
211 |
|
|
212 |
- setupOSX();
|
|
213 |
+ //setupOSX();
|
|
214 |
|
|
215 |
String loadFromURL = SystemProperties.getOSDependentProperty("findbugs.loadBugsFromURL");
|
|
216 |
|
|
217 |
@@ -486,6 +486,7 @@
|
|
218 |
mainFrame.waitForMainFrameInitialized();
|
|
219 |
}
|
|
220 |
|
|
221 |
+ /* disabled for Debian
|
|
222 |
private void setupOSX() {
|
|
223 |
if (MainFrame.MAC_OS_X) {
|
|
224 |
try {
|
|
225 |
@@ -514,6 +515,7 @@
|
|
226 |
}
|
|
227 |
}
|
|
228 |
}
|
|
229 |
+ */
|
|
230 |
}
|
|
231 |
|
|
232 |
/**
|