changeset in /hg/icedtea6: Convert DOS line endings to UNIX.
Andrew John Hughes
ahughes at redhat.com
Tue Aug 4 09:37:53 PDT 2009
changeset e315bc774531 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e315bc774531
description:
Convert DOS line endings to UNIX.
2009-08-04 Andrew John Hughes <ahughes at redhat.com>
* rt/net/sourceforge/jnlp/DefaultLaunchHandler.java,
* rt/net/sourceforge/jnlp/ExtensionDesc.java,
* rt/net/sourceforge/jnlp/JNLPFile.java,
* rt/net/sourceforge/jnlp/LaunchException.java,
* rt/net/sourceforge/jnlp/LaunchHandler.java,
* rt/net/sourceforge/jnlp/Launcher.java,
* rt/net/sourceforge/jnlp/ParseException.java,
* rt/net/sourceforge/jnlp/Parser.java,
* rt/net/sourceforge/jnlp/cache/CacheEntry.java,
* rt/net/sourceforge/jnlp/cache/CacheUtil.java,
* rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
* rt/net/sourceforge/jnlp/cache/ResourceTracker.java,
* rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
* rt/net/sourceforge/jnlp/runtime/AppletInstance.java,
* rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
* rt/net/sourceforge/jnlp/runtime/Boot.java,
* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
* rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
* rt/net/sourceforge/jnlp/services/XBasicService.java,
* rt/net/sourceforge/jnlp/util/PropertiesFile.java,
* rt/net/sourceforge/jnlp/util/Reflect.java,
* rt/net/sourceforge/jnlp/util/WeakList.java,
* test/jtreg/com/sun/javatest/exec/FileTable.java,
* test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java,
* test/jtreg/com/sun/javatest/report/XMLReportMaker.java:
Convert DOS line endings to UNIX.
diffstat:
27 files changed, 9963 insertions(+), 9933 deletions(-)
ChangeLog | 30
rt/net/sourceforge/jnlp/DefaultLaunchHandler.java | 228
rt/net/sourceforge/jnlp/ExtensionDesc.java | 290 -
rt/net/sourceforge/jnlp/JNLPFile.java | 1156 ++--
rt/net/sourceforge/jnlp/LaunchException.java | 380 -
rt/net/sourceforge/jnlp/LaunchHandler.java | 136
rt/net/sourceforge/jnlp/Launcher.java | 1550 +++---
rt/net/sourceforge/jnlp/ParseException.java | 188
rt/net/sourceforge/jnlp/Parser.java | 2412 +++++-----
rt/net/sourceforge/jnlp/cache/CacheEntry.java | 348 -
rt/net/sourceforge/jnlp/cache/CacheUtil.java | 788 +--
rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 642 +-
rt/net/sourceforge/jnlp/cache/ResourceTracker.java | 2102 ++++----
rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 708 +-
rt/net/sourceforge/jnlp/runtime/AppletInstance.java | 278 -
rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 586 +-
rt/net/sourceforge/jnlp/runtime/Boot.java | 892 +--
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 1982 ++++----
rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 1118 ++--
rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 980 ++--
rt/net/sourceforge/jnlp/services/XBasicService.java | 468 -
rt/net/sourceforge/jnlp/util/PropertiesFile.java | 296 -
rt/net/sourceforge/jnlp/util/Reflect.java | 296 -
rt/net/sourceforge/jnlp/util/WeakList.java | 256 -
test/jtreg/com/sun/javatest/exec/FileTable.java | 146
test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java | 474 -
test/jtreg/com/sun/javatest/report/XMLReportMaker.java | 1166 ++--
diffs (truncated from 20016 to 500 lines):
diff -r f5ed1489ddcf -r e315bc774531 ChangeLog
--- a/ChangeLog Tue Aug 04 11:34:49 2009 -0400
+++ b/ChangeLog Tue Aug 04 17:39:11 2009 +0100
@@ -1,3 +1,33 @@ 2009-08-04 Omair Majid <omajid at redhat.
+2009-08-04 Andrew John Hughes <ahughes at redhat.com>
+
+ * rt/net/sourceforge/jnlp/DefaultLaunchHandler.java,
+ * rt/net/sourceforge/jnlp/ExtensionDesc.java,
+ * rt/net/sourceforge/jnlp/JNLPFile.java,
+ * rt/net/sourceforge/jnlp/LaunchException.java,
+ * rt/net/sourceforge/jnlp/LaunchHandler.java,
+ * rt/net/sourceforge/jnlp/Launcher.java,
+ * rt/net/sourceforge/jnlp/ParseException.java,
+ * rt/net/sourceforge/jnlp/Parser.java,
+ * rt/net/sourceforge/jnlp/cache/CacheEntry.java,
+ * rt/net/sourceforge/jnlp/cache/CacheUtil.java,
+ * rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
+ * rt/net/sourceforge/jnlp/cache/ResourceTracker.java,
+ * rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
+ * rt/net/sourceforge/jnlp/runtime/AppletInstance.java,
+ * rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
+ * rt/net/sourceforge/jnlp/runtime/Boot.java,
+ * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
+ * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
+ * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
+ * rt/net/sourceforge/jnlp/services/XBasicService.java,
+ * rt/net/sourceforge/jnlp/util/PropertiesFile.java,
+ * rt/net/sourceforge/jnlp/util/Reflect.java,
+ * rt/net/sourceforge/jnlp/util/WeakList.java,
+ * test/jtreg/com/sun/javatest/exec/FileTable.java,
+ * test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java,
+ * test/jtreg/com/sun/javatest/report/XMLReportMaker.java:
+ Convert DOS line endings to UNIX.
+
2009-08-04 Omair Majid <omajid at redhat.com>
* rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java
diff -r f5ed1489ddcf -r e315bc774531 rt/net/sourceforge/jnlp/DefaultLaunchHandler.java
--- a/rt/net/sourceforge/jnlp/DefaultLaunchHandler.java Tue Aug 04 11:34:49 2009 -0400
+++ b/rt/net/sourceforge/jnlp/DefaultLaunchHandler.java Tue Aug 04 17:39:11 2009 +0100
@@ -1,114 +1,114 @@
-// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-package net.sourceforge.jnlp;
-
-import net.sourceforge.jnlp.runtime.*;
-import net.sourceforge.jnlp.util.*;
-
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-
-/**
- * This default implementation shows prints the exception to
- * stdout and if not in headless mode displays the exception in a
- * dialog.
- *
- * @author <a href="mailto:jmaxwell at users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
- * @version $Revision: 1.1 $
- */
-public class DefaultLaunchHandler implements LaunchHandler {
-
- /**
- * Called when the application could not be launched due to a
- * fatal error, such as the inability to find the main class
- * or non-parseable XML.
- */
- public void launchError(LaunchException exception) {
- printMessage(exception);
- }
-
- /**
- * Called when launching the application can not be launched
- * due to an error that is not fatal. For example a JNLP file
- * that is not strictly correct yet does not necessarily
- * prohibit the system from attempting to launch the
- * application.
- *
- * @return true if the launch should continue, false to abort
- */
- public boolean launchWarning(LaunchException warning) {
- printMessage(warning);
- return true;
- }
-
- /**
- * Called when a security validation error occurs while
- * launching the application.
- *
- * @return true to allow the application to continue, false to stop it.
- */
- public boolean validationError(LaunchException security) {
- printMessage(security);
- return true;
- }
-
- /**
- * Called when an application, applet, or installer has been
- * launched successfully (the main method or applet start method
- * returned normally).
- *
- * @param application the launched application instance
- */
- public void launchCompleted(ApplicationInstance application) {
- //
- }
-
- /**
- * Print a message to stdout.
- */
- protected void printMessage(LaunchException ex) {
- StringBuffer result = new StringBuffer();
- result.append("netx: ");
- result.append(ex.getCategory());
- if (ex.getSummary() != null) {
- result.append(": ");
- result.append(ex.getSummary());
- }
-
- if (JNLPRuntime.isDebug()) {
- if (ex.getCause() != null)
- ex.getCause().printStackTrace();
- else
- ex.printStackTrace();
- }
-
- Throwable causes[] = ex.getCauses();
-
- for (int i=0; i < causes.length; i++) {
- result.append(" (");
- result.append(causes[i].getClass().getName());
- result.append(" ");
- result.append(causes[i].getMessage());
- result.append(")");
- }
- }
-
-}
-
-
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+package net.sourceforge.jnlp;
+
+import net.sourceforge.jnlp.runtime.*;
+import net.sourceforge.jnlp.util.*;
+
+import java.awt.*;
+import java.util.*;
+import javax.swing.*;
+
+
+/**
+ * This default implementation shows prints the exception to
+ * stdout and if not in headless mode displays the exception in a
+ * dialog.
+ *
+ * @author <a href="mailto:jmaxwell at users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.1 $
+ */
+public class DefaultLaunchHandler implements LaunchHandler {
+
+ /**
+ * Called when the application could not be launched due to a
+ * fatal error, such as the inability to find the main class
+ * or non-parseable XML.
+ */
+ public void launchError(LaunchException exception) {
+ printMessage(exception);
+ }
+
+ /**
+ * Called when launching the application can not be launched
+ * due to an error that is not fatal. For example a JNLP file
+ * that is not strictly correct yet does not necessarily
+ * prohibit the system from attempting to launch the
+ * application.
+ *
+ * @return true if the launch should continue, false to abort
+ */
+ public boolean launchWarning(LaunchException warning) {
+ printMessage(warning);
+ return true;
+ }
+
+ /**
+ * Called when a security validation error occurs while
+ * launching the application.
+ *
+ * @return true to allow the application to continue, false to stop it.
+ */
+ public boolean validationError(LaunchException security) {
+ printMessage(security);
+ return true;
+ }
+
+ /**
+ * Called when an application, applet, or installer has been
+ * launched successfully (the main method or applet start method
+ * returned normally).
+ *
+ * @param application the launched application instance
+ */
+ public void launchCompleted(ApplicationInstance application) {
+ //
+ }
+
+ /**
+ * Print a message to stdout.
+ */
+ protected void printMessage(LaunchException ex) {
+ StringBuffer result = new StringBuffer();
+ result.append("netx: ");
+ result.append(ex.getCategory());
+ if (ex.getSummary() != null) {
+ result.append(": ");
+ result.append(ex.getSummary());
+ }
+
+ if (JNLPRuntime.isDebug()) {
+ if (ex.getCause() != null)
+ ex.getCause().printStackTrace();
+ else
+ ex.printStackTrace();
+ }
+
+ Throwable causes[] = ex.getCauses();
+
+ for (int i=0; i < causes.length; i++) {
+ result.append(" (");
+ result.append(causes[i].getClass().getName());
+ result.append(" ");
+ result.append(causes[i].getMessage());
+ result.append(")");
+ }
+ }
+
+}
+
+
diff -r f5ed1489ddcf -r e315bc774531 rt/net/sourceforge/jnlp/ExtensionDesc.java
--- a/rt/net/sourceforge/jnlp/ExtensionDesc.java Tue Aug 04 11:34:49 2009 -0400
+++ b/rt/net/sourceforge/jnlp/ExtensionDesc.java Tue Aug 04 17:39:11 2009 +0100
@@ -1,145 +1,145 @@
-// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-
-package net.sourceforge.jnlp;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import net.sourceforge.jnlp.runtime.JNLPRuntime;
-
-
-/**
- * The extension element.
- *
- * @author <a href="mailto:jmaxwell at users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
- * @version $Revision: 1.8 $
- */
-public class ExtensionDesc {
-
- /** the extension name */
- private String name;
-
- /** the required extension version */
- private Version version;
-
- /** the location of the extension JNLP file */
- private URL location;
-
- /** the JNLPFile the extension refers to */
- private JNLPFile file;
-
- /** map from ext-part to local part */
- private Map extToPart = new HashMap();
-
- /** eager ext parts */
- private List eagerExtParts = new ArrayList();
-
-
- /**
- * Create an extention descriptor.
- *
- * @param name the extension name
- * @param version the required version of the extention JNLPFile
- * @param location the location of the extention JNLP file
- */
- public ExtensionDesc(String name, Version version, URL location) {
- this.name = name;
- this.version = version;
- this.location = location;
- }
-
- /**
- * Adds an extension part to be downloaded when the specified
- * part of the main JNLP file is loaded. The extension part
- * will be downloaded before the application is launched if the
- * lazy value is false or the part is empty or null.
- *
- * @param extPart the part name in the extension file
- * @param part the part name in the main file
- * @param lazy whether to load the part before launching
- */
- protected void addPart(String extPart, String part, boolean lazy) {
- extToPart.put(extPart, part);
-
- if (!lazy || part == null || part.length() == 0)
- eagerExtParts.add(extPart);
- }
-
- /**
- * Returns the parts in the extension JNLP file mapped to the
- * part of the main file.
- */
- public String[] getExtensionParts(String thisPart) {
-
- return null;
- }
-
- /**
- * Returns the name of the extension.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns the required version of the extension JNLP file.
- */
- public Version getVersion() {
- return version;
- }
-
- /**
- * Returns the location of the extension JNLP file.
- */
- public URL getLocation() {
- return location;
- }
-
- /**
- * Resolves the extension by creating a JNLPFile from the file
- * specified by the extension's location property.
- *
- * @throws IOException if the extension JNLPFile could not be resolved.
- * @throws ParseException if the extension JNLPFile could not be
- * parsed or was not a component or installer descriptor.
- */
- public void resolve() throws ParseException, IOException {
- if (file == null) {
- file = new JNLPFile(location);
-
- if (JNLPRuntime.isDebug())
- System.out.println("Resolve: "+file.getInformation().getTitle());
-
- // check for it being an extension descriptor
- if (!file.isComponent() && !file.isInstaller())
- throw new ParseException(JNLPRuntime.getMessage("JInvalidExtensionDescriptor", new Object[] {name, location} ));
- }
-
- }
-
- /**
- * Returns a JNLPFile for the extension, or null if the JNLP
- * file has not been resolved.
- */
- public JNLPFile getJNLPFile() {
- return file;
- }
-}
-
-
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+
+
+/**
+ * The extension element.
+ *
+ * @author <a href="mailto:jmaxwell at users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.8 $
+ */
+public class ExtensionDesc {
+
+ /** the extension name */
+ private String name;
+
+ /** the required extension version */
+ private Version version;
+
+ /** the location of the extension JNLP file */
+ private URL location;
+
+ /** the JNLPFile the extension refers to */
+ private JNLPFile file;
+
+ /** map from ext-part to local part */
+ private Map extToPart = new HashMap();
+
+ /** eager ext parts */
+ private List eagerExtParts = new ArrayList();
+
+
+ /**
+ * Create an extention descriptor.
+ *
+ * @param name the extension name
+ * @param version the required version of the extention JNLPFile
+ * @param location the location of the extention JNLP file
+ */
+ public ExtensionDesc(String name, Version version, URL location) {
+ this.name = name;
+ this.version = version;
+ this.location = location;
+ }
+
+ /**
+ * Adds an extension part to be downloaded when the specified
+ * part of the main JNLP file is loaded. The extension part
+ * will be downloaded before the application is launched if the
+ * lazy value is false or the part is empty or null.
+ *
+ * @param extPart the part name in the extension file
+ * @param part the part name in the main file
+ * @param lazy whether to load the part before launching
+ */
+ protected void addPart(String extPart, String part, boolean lazy) {
+ extToPart.put(extPart, part);
+
+ if (!lazy || part == null || part.length() == 0)
+ eagerExtParts.add(extPart);
+ }
More information about the distro-pkg-dev
mailing list