Remove unnecessary whitespace from JDT launching plug-ins
Using the Source -> Cleanup -> Remove unnecessary whitespace option
Change-Id: Ibb6cf65941ed235be89414a141265e2f4e1cb8c7
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
index b36c0e3..edc0ebd 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -20,7 +20,7 @@
* Special override for MacOSX wrapping
*/
public class MacOSXDebugVMRunner extends StandardVMDebugger {
-
+
/**
* Constructor
* @param vmInstance
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
index 34fd96a..3295b06 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
@@ -26,11 +26,11 @@
Assert.isTrue(fgPlugin == null);
fgPlugin= this;
}
-
+
public static MacOSXLaunchingPlugin getDefault() {
return fgPlugin;
}
-
+
/*
* Convenience method which returns the unique identifier of this plug-in.
*/
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
index 912df6a..fb51681 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
@@ -35,11 +35,11 @@
if (ILaunchManager.RUN_MODE.equals(mode)) {
return new MacOSXVMRunner(this);
}
-
+
if (ILaunchManager.DEBUG_MODE.equals(mode)) {
return new MacOSXDebugVMRunner(this);
}
-
+
return null;
}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
index 4a6c227..8ead971 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
@@ -37,9 +37,9 @@
/**
* This class provides the implementation of the {@link IVMInstallType} for Mac OSX.
- *
- * The default VM locations are outlined below. each VM except for developer VMs provide links in the
- * <code>/System/Library/Frameworks/JavaVM.framework/Versions/</code> folder, with a link named
+ *
+ * The default VM locations are outlined below. each VM except for developer VMs provide links in the
+ * <code>/System/Library/Frameworks/JavaVM.framework/Versions/</code> folder, with a link named
* <code>CurrentJDK</code> that points to the VM you have set using the Java preference tool in the system preferences.
* <br><br>
* The directory structure for Java VMs prior to Snow Leopard is as follows:
@@ -52,7 +52,7 @@
* Home/
* src.jar
* </pre>
- *
+ *
* The directory structure for developer VMs is:
* <pre>
* /Library/Java/JavaVirtualMachines/
@@ -64,7 +64,7 @@
* ...
* src.zip
* </pre>
- *
+ *
* The directory structure for Snow Leopard and Lion VMs is:
* <pre>
* /System/Library/Java/JavaVirtualMachines/
@@ -74,12 +74,12 @@
* Home/
* src.zip
* </pre>
- *
+ *
* @see http://developer.apple.com/library/mac/#qa/qa1170/_index.html
* @see http://developer.apple.com/library/mac/#releasenotes/Java/JavaSnowLeopardUpdate3LeopardUpdate8RN/NewandNoteworthy/NewandNoteworthy.html#//apple_ref/doc/uid/TP40010380-CH4-SW1
*/
public class MacOSXVMInstallType extends StandardVMType {
-
+
/** The OS keeps all the JVM versions in this directory */
private static final String JVM_VERSION_LOC= "/System/Library/Frameworks/JavaVM.framework/Versions/"; //$NON-NLS-1$
private static final File JVM_VERSIONS_FOLDER= new File(JVM_VERSION_LOC);
@@ -89,7 +89,7 @@
private static final String JVM_HOME= "Home"; //$NON-NLS-1$
/** The doc (for all JVMs) lives here (if the developer kit has been expanded)*/
private static final String JAVADOC_LOC= "/Developer/Documentation/Java/Reference/"; //$NON-NLS-1$
- /** The doc for 1.4.1 is kept in a sub directory of the above. */
+ /** The doc for 1.4.1 is kept in a sub directory of the above. */
private static final String JAVADOC_SUBDIR= "/doc/api"; //$NON-NLS-1$
/**
* The name of the src.zip file for the JDK source
@@ -118,20 +118,20 @@
static final String JVM_CLASSES = "Classes"; //$NON-NLS-1$
/**
* The name of the Versions folder for legacy JRE/JDK installs
- * @since 3.2.200
+ * @since 3.2.200
*/
static final String JVM_VERSIONS = "Versions"; //$NON-NLS-1$
-
+
@Override
public String getName() {
return Messages.MacOSXVMInstallType_0;
}
-
+
@Override
public IVMInstall doCreateVMInstall(String id) {
return new MacOSXVMInstall(this, id);
}
-
+
/*
* @see IVMInstallType#detectInstallLocation()
*/
@@ -141,7 +141,7 @@
// try to find the VM used to launch Eclipse
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=407402
File defaultLocation = getJavaHomeLocation();
-
+
// find all installed VMs
VMStandin[] vms = MacInstalledJREs.getInstalledJREs(null);
File firstLocation = null;
@@ -161,7 +161,7 @@
defaultInstall = install;
}
}
-
+
// determine the default VM
if (defaultInstall == null) {
if (defaultLocation != null) {
@@ -194,8 +194,8 @@
/**
* The proper way to find installed JREs is to parse the XML output produced from "java_home -X"
- * (see bug 325777). However, if that fails, revert to the hard coded search.
- *
+ * (see bug 325777). However, if that fails, revert to the hard coded search.
+ *
* @return file that points to the default JRE install
*/
private File detectInstallLocationOld() {
@@ -204,7 +204,7 @@
return null;
}
if (!JVM_VERSIONS_FOLDER.exists() || !JVM_VERSIONS_FOLDER.isDirectory()) {
- String message= NLS.bind(Messages.MacOSXVMInstallType_1, JVM_VERSIONS_FOLDER);
+ String message= NLS.bind(Messages.MacOSXVMInstallType_1, JVM_VERSIONS_FOLDER);
LaunchingPlugin.log(message);
return null;
}
@@ -239,11 +239,11 @@
}
return defaultLocation;
}
-
+
/**
* The proper way to find installed JREs is to parse the XML output produced from "java_home -X"
- * (see bug 325777). However, if that fails, revert to the hard coded search.
- *
+ * (see bug 325777). However, if that fails, revert to the hard coded search.
+ *
* @return array of files that point to JRE install directories
*/
private File[] getAllVersionsOld() {
@@ -257,13 +257,13 @@
/**
* The proper way to find the default JRE is to parse the XML output produced from "java_home -X"
* and take the first entry in the list. However, if that fails, revert to the hard coded search.
- *
+ *
* @return a file that points to the default JRE install directory
*/
private File getCurrentJDKOld() {
return resolveSymbolicLinks(new File(JVM_VERSIONS_FOLDER, CURRENT_JDK));
}
-
+
private File resolveSymbolicLinks(File file) {
try {
return file.getCanonicalFile();
@@ -285,9 +285,9 @@
File classes = new File(installLocation, "../Classes"); //$NON-NLS-1$
File lib1= new File(classes, "classes.jar"); //$NON-NLS-1$
File lib2= new File(classes, "ui.jar"); //$NON-NLS-1$
-
+
String[] libs = new String[] { lib1.toString(),lib2.toString() };
-
+
File lib = new File(installLocation, "lib"); //$NON-NLS-1$
File extDir = new File(lib, "ext"); //$NON-NLS-1$
String[] dirs = null;
@@ -303,11 +303,11 @@
endDirs = new String[] {endDir.getAbsolutePath()};
} else {
endDirs = new String[0];
- }
-
+ }
+
return new LibraryInfo("???", libs, dirs, endDirs); //$NON-NLS-1$
}
-
+
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.launching.StandardVMType#getDefaultSystemLibrarySource(java.io.File)
*/
@@ -344,12 +344,12 @@
}
/**
- * Checks to see if <code>src.zip</code> or <code>src.jar</code> exists in the given parent
+ * Checks to see if <code>src.zip</code> or <code>src.jar</code> exists in the given parent
* folder. Returns <code>null</code> if it does not exist.
* <br><br>
* The newer naming of the archive is <code>src.zip</code> and the older (pre-1.6) is
* <code>src.jar</code>
- *
+ *
* @param parent the parent directory
* @return the {@link File} for the source archive or <code>null</code>
* @since 3.2.200
@@ -367,7 +367,7 @@
}
return null;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.launching.StandardVMType#validateInstallLocation(java.io.File)
*/
@@ -381,14 +381,14 @@
}
return new Status(IStatus.ERROR, id, 0, Messages.MacOSXVMInstallType_2, null);
}
-
+
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.launching.StandardVMType#getDefaultJavadocLocation(java.io.File)
*/
@Override
public URL getDefaultJavadocLocation(File installLocation) {
// try in local filesystem
- String id= null;
+ String id= null;
try {
String post= File.separator + JVM_HOME;
String path= installLocation.getCanonicalPath();
@@ -416,7 +416,7 @@
}
}
}
-
+
// fall back
return super.getDefaultJavadocLocation(installLocation);
}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
index d981ba2..2760adc 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -17,7 +17,7 @@
import org.eclipse.jdt.launching.IVMInstall;
public class MacOSXVMRunner extends StandardVMRunner {
-
+
/**
* Constructor
* @param vmInstance
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/Messages.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/Messages.java
index 487a865..03473f2 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/Messages.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/Messages.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM - Initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF
index 17dd5e6..5b64915 100644
--- a/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.launching.ui.macosx;singleton:=true
-Bundle-Version: 1.2.400.qualifier
+Bundle-Version: 1.2.500.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.launching.ui.macosx/pom.xml b/org.eclipse.jdt.launching.ui.macosx/pom.xml
index 51b107c..66ba4a9 100644
--- a/org.eclipse.jdt.launching.ui.macosx/pom.xml
+++ b/org.eclipse.jdt.launching.ui.macosx/pom.xml
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching.ui.macosx</artifactId>
- <version>1.2.400-SNAPSHOT</version>
+ <version>1.2.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleAttributes.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleAttributes.java
index 7cb7505..75aa216 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleAttributes.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleAttributes.java
@@ -12,15 +12,15 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.jdt.internal.ui.macbundler;
-
+
/**
* All keys used in the BundleDescription.
*/
public interface BundleAttributes {
static final String LAUNCHER = "CFBundleExecutable"; //$NON-NLS-1$
-
+
static final String ALL= "ALL"; //$NON-NLS-1$
-
+
static final String GETINFO = "GetInfo"; //$NON-NLS-1$
static final String IDENTIFIER = "Identifier"; //$NON-NLS-1$
static final String ICONFILE = "IconFile"; //$NON-NLS-1$
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
index b946056..9f98ba2 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
@@ -38,11 +38,11 @@
public class BundleBuilder implements BundleAttributes {
-
+
private List<Process> fProcesses= new ArrayList<Process>();
private BundleDescription fBundleDescription;
-
-
+
+
/**
* Create a new bundle
* @param bd the new description
@@ -50,9 +50,9 @@
* @throws IOException if something happens
*/
public void createBundle(BundleDescription bd, IProgressMonitor pm) throws IOException {
-
+
fBundleDescription= bd;
-
+
File tmp_dir= new File(bd.get(DESTINATIONDIRECTORY));
String app_dir_name= bd.get(APPNAME) + ".app"; //$NON-NLS-1$
File app_dir= new File(tmp_dir, app_dir_name);
@@ -60,7 +60,7 @@
deleteDir(app_dir);
}
app_dir= createDir(tmp_dir, app_dir_name, false);
-
+
File contents_dir= createDir(app_dir, "Contents", false); //$NON-NLS-1$
createPkgInfo(contents_dir);
@@ -68,14 +68,14 @@
String launcher_path= bd.get(LAUNCHER);
if (launcher_path == null) {
throw new IOException();
- }
+ }
String launcher= copyFile(macos_dir, launcher_path, null);
-
+
File resources_dir= createDir(contents_dir, "Resources", false); //$NON-NLS-1$
File java_dir= createDir(resources_dir, "Java", false); //$NON-NLS-1$
-
+
createInfoPList(contents_dir, resources_dir, java_dir, launcher);
-
+
Iterator<Process> iter= fProcesses.iterator();
while (iter.hasNext()) {
Process p= iter.next();
@@ -84,32 +84,32 @@
} catch (InterruptedException e) {
// silently ignore
}
- }
+ }
}
-
+
private void createInfoPList(File contents_dir, File resources_dir, File java_dir, String launcher) throws IOException {
DocumentBuilder docBuilder= null;
DocumentBuilderFactory factory= DocumentBuilderFactory.newInstance();
factory.setValidating(false);
- try {
+ try {
docBuilder= factory.newDocumentBuilder();
} catch (ParserConfigurationException ex) {
System.err.println("createInfoPList: could not get XML builder"); //$NON-NLS-1$
throw new IOException("Could not get XML builder"); //$NON-NLS-1$
}
Document doc= docBuilder.newDocument();
-
+
Element plist= doc.createElement("plist"); //$NON-NLS-1$
doc.appendChild(plist);
plist.setAttribute("version", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$
-
+
Element dict= doc.createElement("dict"); //$NON-NLS-1$
plist.appendChild(dict);
-
+
pair(dict, "CFBundleExecutable", null, launcher); //$NON-NLS-1$
pair(dict, "CFBundleGetInfoString", GETINFO, null); //$NON-NLS-1$
pair(dict, "CFBundleInfoDictionaryVersion", null, "6.0"); //$NON-NLS-1$ //$NON-NLS-2$
-
+
String iconName= null;
String appName= fBundleDescription.get(APPNAME, null);
if (appName != null)
@@ -121,41 +121,41 @@
{
pair(dict, "CFBundleIconFile", null, fname); //$NON-NLS-1$
}
-
+
pair(dict, "CFBundleIdentifier", IDENTIFIER, null); //$NON-NLS-1$
pair(dict, "CFBundleName", APPNAME, null); //$NON-NLS-1$
pair(dict, "CFBundlePackageType", null, "APPL"); //$NON-NLS-1$ //$NON-NLS-2$
pair(dict, "CFBundleShortVersionString", VERSION, null); //$NON-NLS-1$
pair(dict, "CFBundleSignature", SIGNATURE, "????"); //$NON-NLS-1$ //$NON-NLS-2$
pair(dict, "CFBundleVersion", null, "1.0.1"); //$NON-NLS-1$ //$NON-NLS-2$
-
+
Element jdict= doc.createElement("dict"); //$NON-NLS-1$
add(dict, "Java", jdict); //$NON-NLS-1$
-
+
pair(jdict, "JVMVersion", JVMVERSION, null); //$NON-NLS-1$
pair(jdict, "MainClass", MAINCLASS, null); //$NON-NLS-1$
pair(jdict, "WorkingDirectory", WORKINGDIR, null); //$NON-NLS-1$
-
+
if (fBundleDescription.get(USES_SWT, false))
{
addTrue(jdict, "StartOnMainThread"); //$NON-NLS-1$
}
-
+
String arguments= fBundleDescription.get(ARGUMENTS, null);
if (arguments != null) {
Element argArray= doc.createElement("array"); //$NON-NLS-1$
add(jdict, "Arguments", argArray); //$NON-NLS-1$
- StringTokenizer st= new StringTokenizer(arguments);
+ StringTokenizer st= new StringTokenizer(arguments);
while (st.hasMoreTokens()) {
String arg= st.nextToken();
Element type= doc.createElement("string"); //$NON-NLS-1$
- argArray.appendChild(type);
- type.appendChild(doc.createTextNode(arg));
+ argArray.appendChild(type);
+ type.appendChild(doc.createTextNode(arg));
}
}
-
+
pair(jdict, "VMOptions", VMOPTIONS, null); //$NON-NLS-1$
-
+
int[] id= new int[] { 0 };
ResourceInfo[] ris= fBundleDescription.getResources(true);
if (ris.length > 0) {
@@ -196,7 +196,7 @@
System.err.println("createInfoPList: could not transform to XML"); //$NON-NLS-1$
}
}
-
+
private void add(Element dict, String key, Element value) {
Document document= dict.getOwnerDocument();
Element k= document.createElement("key"); //$NON-NLS-1$
@@ -204,18 +204,18 @@
k.appendChild(document.createTextNode(key));
dict.appendChild(value);
}
-
+
private void create(Element parent, String s) {
Document document= parent.getOwnerDocument();
Element type= document.createElement("string"); //$NON-NLS-1$
- parent.appendChild(type);
+ parent.appendChild(type);
type.appendChild(document.createTextNode(s));
}
private void createTrue(Element parent) {
Document document= parent.getOwnerDocument();
Element type= document.createElement("true"); //$NON-NLS-1$
- parent.appendChild(type);
+ parent.appendChild(type);
}
private void add(Element dict, String key, String value) {
@@ -225,7 +225,7 @@
k.appendChild(document.createTextNode(key));
create(dict, value);
}
-
+
private void addTrue(Element dict, String key) {
Document document= dict.getOwnerDocument();
Element k= document.createElement("key"); //$NON-NLS-1$
@@ -233,7 +233,7 @@
k.appendChild(document.createTextNode(key));
createTrue(dict);
}
-
+
private void pair(Element dict, String outkey, String inkey, String dflt) {
String value= null;
if (inkey != null) {
@@ -245,7 +245,7 @@
add(dict, outkey, value);
}
}
-
+
private String processClasspathEntry(File java_dir, String name, int[] id_ref) throws IOException {
File f= new File(name);
if (f.isDirectory()) {
@@ -259,14 +259,14 @@
}
return "$JAVAROOT/" + name; //$NON-NLS-1$
}
-
+
private void createPkgInfo(File contents_dir) throws IOException {
File pkgInfo= new File(contents_dir, "PkgInfo"); //$NON-NLS-1$
try (FileOutputStream os = new FileOutputStream(pkgInfo)) {
os.write(("APPL" + fBundleDescription.get(SIGNATURE, "????")).getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
}
}
-
+
private static void deleteDir(File dir) {
File[] files= dir.listFiles();
if (files != null) {
@@ -276,7 +276,7 @@
}
dir.delete();
}
-
+
private File createDir(File parent_dir, String dir_name, boolean remove) throws IOException {
File dir= new File(parent_dir, dir_name);
if (dir.exists()) {
@@ -291,7 +291,7 @@
}
return dir;
}
-
+
private String copyFile(File todir, String fromPath, String toname) throws IOException {
if (toname == null) {
int pos= fromPath.lastIndexOf('/');
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
index 89a9eaf..1dc2b80 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
@@ -37,7 +37,7 @@
class BundleDescription implements BundleAttributes {
-
+
private static final String STUB= "/System/Library/Frameworks/JavaVM.framework/Versions/A/Resources/MacOS/JavaApplicationStub"; //$NON-NLS-1$
private static final String ICON= "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Resources/GenericApp.icns"; //$NON-NLS-1$
private static Set<String> RUN_MODE;
@@ -45,18 +45,18 @@
RUN_MODE = new HashSet<String>();
RUN_MODE.add(ILaunchManager.RUN_MODE);
}
-
+
private ListenerList<IPropertyChangeListener> fListeners= new ListenerList<>();
private Properties fProperties= new Properties();
private List<ResourceInfo> fClassPath= new ArrayList<ResourceInfo>();
private List<ResourceInfo> fResources= new ArrayList<ResourceInfo>();
Properties fProperties2= new Properties();
-
-
+
+
BundleDescription() {
clear();
}
-
+
void clear() {
fProperties.clear();
fClassPath.clear();
@@ -65,7 +65,7 @@
fProperties.put(SIGNATURE, "????"); //$NON-NLS-1$
fProperties.put(ICONFILE, ICON);
}
-
+
void addResource(ResourceInfo ri, boolean onClasspath) {
if (onClasspath) {
fClassPath.add(ri);
@@ -73,12 +73,12 @@
fResources.add(ri);
}
}
-
+
boolean removeResource(ResourceInfo ri, boolean onClasspath) {
if (onClasspath) {
return fClassPath.remove(ri);
}
- return fResources.remove(ri);
+ return fResources.remove(ri);
}
ResourceInfo[] getResources(boolean onClasspath) {
@@ -87,23 +87,23 @@
}
return fResources.toArray(new ResourceInfo[fResources.size()]);
}
-
+
void addListener(IPropertyChangeListener listener) {
fListeners.add(listener);
}
-
+
void removeListener(IPropertyChangeListener listener) {
fListeners.remove(listener);
}
-
+
String get(String key) {
return fProperties.getProperty(key);
}
-
+
public String get(String key, String dflt) {
return fProperties.getProperty(key, dflt);
}
-
+
public boolean get(String key, boolean dflt) {
Boolean v= (Boolean) fProperties.get(key);
if (v == null) {
@@ -111,11 +111,11 @@
}
return v.booleanValue();
}
-
+
void setValue(String key, Object value) {
fProperties.put(key, value);
}
-
+
private static AbstractJavaLaunchConfigurationDelegate getDelegate(ILaunchConfiguration lc) throws CoreException {
ILaunchDelegate[] delegates = lc.getType().getDelegates(RUN_MODE);
for (int i = 0; i < delegates.length; i++) {
@@ -125,7 +125,7 @@
}
throw new CoreException(new Status(IStatus.ERROR, MacOSXUILaunchingPlugin.getUniqueIdentifier(), "Internal Error: missing Java launcher")); //$NON-NLS-1$
}
-
+
@SuppressWarnings("deprecation")
void inititialize(ILaunchConfiguration lc) {
AbstractJavaLaunchConfigurationDelegate lcd;
@@ -134,11 +134,11 @@
} catch (CoreException e) {
return;
}
-
+
String appName= lc.getName();
fProperties.put(APPNAME, appName);
fProperties.put(GETINFO, appName + Util.getString("BundleDescription.copyright.format")); //$NON-NLS-1$
-
+
try {
fProperties.put(MAINCLASS, lcd.getMainTypeName(lc));
} catch (CoreException e) {
@@ -161,7 +161,7 @@
} catch (CoreException e) {
fProperties.put(MAINCLASS, ""); //$NON-NLS-1$
}
-
+
try {
String[] classpath= lcd.getClasspath(lc);
for (int i= 0; i < classpath.length; i++) {
@@ -170,7 +170,7 @@
} catch (CoreException e) {
//
}
-
+
String vmOptions2= ""; //$NON-NLS-1$
String vmOptions= null;
try {
@@ -202,7 +202,7 @@
}
fProperties.put(VMOPTIONS, vmOptions2);
-
+
boolean isSWT= false;
Iterator<ResourceInfo> iter= fResources.iterator();
while (iter.hasNext()) {
@@ -213,20 +213,20 @@
}
}
fProperties.put(USES_SWT, Boolean.valueOf(isSWT));
-
+
String launcher= null;
if (isSWT)
{
launcher= System.getProperty("org.eclipse.swtlauncher"); //$NON-NLS-1$
}
-
+
if (launcher == null) {
setValue(JVMVERSION, "1.4*"); //$NON-NLS-1$
- launcher= STUB;
+ launcher= STUB;
}
setValue(LAUNCHER, launcher);
-
+
IJavaProject p= null;
try {
p= lcd.getJavaProject(lc);
@@ -239,10 +239,10 @@
else {
fProperties.put(IDENTIFIER, ""); //$NON-NLS-1$
}
-
+
fireChange();
}
-
+
void fireChange() {
PropertyChangeEvent e= new PropertyChangeEvent(this, ALL, null, null);
for (IPropertyChangeListener listener : fListeners) {
@@ -255,7 +255,7 @@
if (path.startsWith("../")) { //$NON-NLS-1$
lib_dir= new File(wd, path);
} else {
- lib_dir= new File(path);
+ lib_dir= new File(path);
}
if (lib_dir.isDirectory()) {
File[] dlls= lib_dir.listFiles();
@@ -272,7 +272,7 @@
}
}
}
-
+
static boolean verify(ILaunchConfiguration lc) {
String name= lc.getName();
if (name.indexOf("jpage") >= 0) { //$NON-NLS-1$
@@ -289,7 +289,7 @@
return false;
}
}
-
+
static boolean matches(ILaunchConfiguration lc, IJavaProject project) {
AbstractJavaLaunchConfigurationDelegate lcd;
try {
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java
index bf043bb..9ef2475 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java
@@ -36,7 +36,7 @@
public abstract class BundleWizardBasePage extends DialogPage implements IWizardPage, BundleAttributes, IPropertyChangeListener {
-
+
/**
* The page that was shown right before this page became visible;
* <code>null</code> if none.
@@ -51,20 +51,20 @@
* if this page has yet to be added to a wizard.
*/
private IWizard fWizard;
-
+
BundleDescription fBundleDescription;
-
+
BundleWizardBasePage(String key, BundleDescription bd) {
super(Util.getString(key + ".title")); //$NON-NLS-1$
fKey= key;
fBundleDescription= bd;
//setMessage(Util.getString(fKey + ".message")); //$NON-NLS-1$
setDescription(Util.getString(fKey + ".description")); //$NON-NLS-1$
-
+
bd.addListener(this);
}
-
+
/* (non-Javadoc)
* Method declared in WizardPage
*/
@@ -77,7 +77,7 @@
}
super.setVisible(visible);
}
-
+
void enterPage() {
//System.out.println("enterPage: " + getName());
}
@@ -102,18 +102,18 @@
*/
@Override
final public void createControl(Composite parent) {
-
+
Composite c= new Composite(parent, SWT.NULL);
c.setLayout(new GridLayout(1, false));
setControl(c);
-
+
createContents(c);
checkIfPageComplete();
}
-
+
abstract public void createContents(Composite parent);
-
+
static void setHeightHint(Control control, int height) {
GridData gd1= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
gd1.heightHint= height;
@@ -142,7 +142,7 @@
if (lines == 2) {
gd.heightHint= 30;
}
- t.setLayoutData(gd);
+ t.setLayoutData(gd);
hookField(t, key);
return t;
}
@@ -178,7 +178,7 @@
c.setLayout(gl);
return c;
}
-
+
void hookField(final Text tf, final String key) {
tf.addModifyListener(new ModifyListener() {
@Override
@@ -188,7 +188,7 @@
}
});
}
-
+
void hookField(final Combo tf, final String key) {
tf.addModifyListener(new ModifyListener() {
@Override
@@ -198,7 +198,7 @@
}
});
}
-
+
void hookButton(final Button b, final String key) {
b.addSelectionListener(new SelectionAdapter() {
@Override
@@ -208,7 +208,7 @@
}
});
}
-
+
final void checkIfPageComplete() {
IWizardContainer c= (fWizard != null) ? fWizard.getContainer() : null;
if (c != null && this == c.getCurrentPage()) {
@@ -217,7 +217,7 @@
}
/////////////////////////////////////////////////////////
-
+
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardPage#canFlipToNextPage()
*/
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java
index 9dd99f5..d8cb8b3 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java
@@ -29,11 +29,11 @@
public class BundleWizardPage2 extends BundleWizardBasePage {
-
+
Text fWorkingDir;
Table fClassPath;
Table fResources;
-
+
protected BundleWizardPage2(BundleDescription bd) {
super("page2", bd); //$NON-NLS-1$
@@ -41,7 +41,7 @@
@Override
public void createContents(Composite parent) {
-
+
Composite c= createComposite(parent, 2);
createLabel(c, Util.getString("page2.workingDirectory.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
fWorkingDir= createText(c, WORKINGDIR, 1);
@@ -49,7 +49,7 @@
fClassPath= createTableGroup(parent, Util.getString("page2.addToClasspath.group.label"), true); //$NON-NLS-1$
fResources= createTableGroup(parent, Util.getString("page2.addToBundle.group.label"), false); //$NON-NLS-1$
}
-
+
Table createTableGroup(Composite parent, String groupName, final boolean onClasspath) {
Group g1= createGroup(parent, groupName, 1);
final Table table= new Table(g1, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
@@ -99,13 +99,13 @@
});
return table;
}
-
+
private void add(Table t, ResourceInfo ri) {
TableItem ti= new TableItem(t, SWT.NONE);
ti.setData(ri);
ti.setText(ri.fPath);
}
-
+
private void remove(Table table, boolean b, Button removeButton) {
TableItem[] selection= table.getSelection();
for (int i= 0; i < selection.length; i++) {
@@ -135,7 +135,7 @@
add(fClassPath, ris[i]);
}
}
-
+
if (fResources != null) {
fResources.removeAll();
ResourceInfo[] ris= fBundleDescription.getResources(false);
@@ -144,7 +144,7 @@
}
}
}
-
+
@Override
public boolean isPageComplete() {
return true;
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java
index a2ce2d8..36b3340 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java
@@ -43,16 +43,16 @@
public void createContents(Composite c) {
Composite c1= createComposite(c, 4);
-
+
createLabel(c1, Util.getString("page3.identifier.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
fIdentifier= createText(c1, IDENTIFIER, 1);
-
+
createLabel(c1, Util.getString("page3.signature.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
fSignature= createText(c1, SIGNATURE, 1);
createLabel(c, Util.getString("page3.vmOptions.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
fVMOptions= createText(c, VMOPTIONS, 2);
-
+
Group g= createGroup(c, Util.getString("page3.propertiesGroup.label"), 1); //$NON-NLS-1$
fProperties= new Table(g, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
fProperties.setHeaderVisible(true);
@@ -64,11 +64,11 @@
}
});
setHeightHint(fProperties, 60);
-
+
TableColumn col0= new TableColumn(fProperties, SWT.NONE);
col0.setText(Util.getString("page3.keys.column.label")); //$NON-NLS-1$
col0.setWidth(150);
-
+
TableColumn col1= new TableColumn(fProperties, SWT.NONE);
col1.setText(Util.getString("page3.values.column.label")); //$NON-NLS-1$
col1.setWidth(150);
@@ -93,9 +93,9 @@
ti.setText(0, key);
ti.setText(1, value);
}
- }
+ }
}
-
+
@Override
public boolean isPageComplete() {
return true;
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java
index abe0ab9..2d54043 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java
@@ -25,14 +25,14 @@
public class MacBundleWizard extends Wizard implements IExportWizard, BundleAttributes {
-
+
IWorkbench fWorkbench;
IStructuredSelection fSelection;
BundleDescription fBundleDescription= new BundleDescription();
public MacBundleWizard() {
setDefaultPageImageDescriptor(createWizardImageDescriptor("exportapp_wiz.png")); //$NON-NLS-1$
- setWindowTitle(Util.getString("MacBundleWizard.title")); //$NON-NLS-1$
+ setWindowTitle(Util.getString("MacBundleWizard.title")); //$NON-NLS-1$
}
/* (non-Javadoc)
@@ -43,7 +43,7 @@
fWorkbench= workbench;
fSelection= selection;
}
-
+
IStructuredSelection getSelection() {
return fSelection;
}
@@ -64,7 +64,7 @@
* @see org.eclipse.jface.wizard.Wizard#performFinish()
*/
@Override
- public boolean performFinish() {
+ public boolean performFinish() {
try {
BundleBuilder bb= new BundleBuilder();
bb.createBundle(fBundleDescription, null);
@@ -77,7 +77,7 @@
private static ImageDescriptor createWizardImageDescriptor(String name) {
try {
- URL baseUrl= MacOSXUILaunchingPlugin.getDefault().getBundle().getEntry("/icons/full/wizban/"); //$NON-NLS-1$
+ URL baseUrl= MacOSXUILaunchingPlugin.getDefault().getBundle().getEntry("/icons/full/wizban/"); //$NON-NLS-1$
if (baseUrl != null) {
return ImageDescriptor.createFromURL(new URL(baseUrl, name));
}
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacOSXUILaunchingPlugin.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacOSXUILaunchingPlugin.java
index ff78123..5174672 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacOSXUILaunchingPlugin.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacOSXUILaunchingPlugin.java
@@ -18,7 +18,7 @@
public class MacOSXUILaunchingPlugin extends Plugin {
-
+
private static MacOSXUILaunchingPlugin fgPlugin;
public MacOSXUILaunchingPlugin() {
@@ -26,7 +26,7 @@
Assert.isTrue(fgPlugin == null);
fgPlugin= this;
}
-
+
public static MacOSXUILaunchingPlugin getDefault() {
return fgPlugin;
}
@@ -43,5 +43,4 @@
}
return getDefault().getBundle().getSymbolicName();
}
-
}
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/ResourceInfo.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/ResourceInfo.java
index 6b36346..8ad4891 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/ResourceInfo.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/ResourceInfo.java
@@ -14,9 +14,9 @@
package org.eclipse.jdt.internal.ui.macbundler;
public class ResourceInfo {
-
+
String fPath;
-
+
ResourceInfo(String path) {
fPath= path;
}
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/Util.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/Util.java
index ad532da..1e1f05e 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/Util.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/Util.java
@@ -18,7 +18,7 @@
public class Util {
-
+
private static final String RESOURCE_BUNDLE= "org.eclipse.jdt.internal.ui.macbundler.BundleMessages"; //$NON-NLS-1$
private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
index c8660ec..e538000 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
@@ -84,7 +84,7 @@
/**
* Launch configuration attribute key. The value is the module name for the main type to launch.
- *
+ *
* @since 3.17
*/
public static final String ATTR_MODULE_NAME = LaunchingPlugin.getUniqueIdentifier() + ".MODULE_NAME"; //$NON-NLS-1$
