#i19331#

Reorganisation of Java packages and directories. ParcelDescriptor and support
classes are now part of ScriptFramework.jar

scripting/java/org/openoffice/idesupport/CommandLineTools.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CommandLineTools.java,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-03-14 11:06:40 $
+ *  last change: $Author: toconnor $ $Date: 2003-09-10 10:45:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,9 +66,12 @@ import java.util.Hashtable;
 import java.util.Enumeration;
 import java.util.StringTokenizer;
 
+import com.sun.star.script.framework.browse.ScriptEntry;
+import com.sun.star.script.framework.browse.ParcelDescriptor;
+
 import org.openoffice.idesupport.zip.ParcelZipper;
-import org.openoffice.idesupport.xml.ParcelDescriptor;
 import org.openoffice.idesupport.filter.AllFilesFilter;
+import com.sun.star.script.framework.browse.XMLParserFactory;
 import org.openoffice.idesupport.*;
 
 public class CommandLineTools {
@@ -79,6 +82,20 @@ public class CommandLineTools {
         CommandLineTools driver = new CommandLineTools();
         Command command = driver.parseArgs(args);
 
+        // Get the URL for the Office DTD directory and pass it to the
+        // XMLParserFactory so that Office xml files can be parsed
+        try {
+            SVersionRCFile sv = SVersionRCFile.createInstance();
+            String office = sv.getDefaultVersion().getPath();
+
+            OfficeInstallation oi = new OfficeInstallation(office);
+            String url = oi.getURL("share/dtd/officedocument/1_0/");
+            XMLParserFactory.setOfficeDTDURL(url);
+        }
+        catch (IOException ioe) {
+            System.err.println("Error getting Office DTD directory");
+        }
+
         if (command == null)
             driver.printUsage();
         else {

scripting/java/org/openoffice/idesupport/ExtensionFinder.java

@@ -4,6 +4,8 @@ import java.io.File;
 import java.util.ArrayList;
 import org.openoffice.idesupport.zip.ParcelZipper;
 
+import com.sun.star.script.framework.browse.ScriptEntry;
+
 public class ExtensionFinder implements MethodFinder {
 
     private String[] extensions;

scripting/java/org/openoffice/idesupport/JavaFinder.java

@@ -12,6 +12,8 @@ import java.net.URLClassLoader;
 import java.net.MalformedURLException;
 import org.openoffice.idesupport.zip.ParcelZipper;
 
+import com.sun.star.script.framework.browse.ScriptEntry;
+
 public class JavaFinder implements MethodFinder {
 
     private static JavaFinder finder;

scripting/java/org/openoffice/idesupport/LocalOffice.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LocalOffice.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: toconnor $ $Date: 2002-11-13 17:44:05 $
+ *  last change: $Author: toconnor $ $Date: 2003-09-10 10:45:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,7 +98,9 @@ public class LocalOffice
             File.separator + "modules" +
             File.separator + "ext" +
             File.separator + "localoffice.jar");
-        ClassLoader appcl   = new DefaultScriptClassLoader(parent, path);
+        // commented out so code will compile
+        // ClassLoader appcl   = new DefaultScriptClassLoader(parent, path);
+        ClassLoader appcl = path.getClass().getClassLoader();
         Class       clazz   = null;
         LocalOffice office  = null;
         try {

scripting/java/org/openoffice/idesupport/MethodFinder.java

@@ -1,6 +1,7 @@
 package org.openoffice.idesupport;
 
 import java.io.File;
+import com.sun.star.script.framework.browse.ScriptEntry;
 
 public interface MethodFinder {
     public ScriptEntry[] findMethods(File basedir);

scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ConfigurePanel.java,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-06-04 13:19:52 $
+ *  last change: $Author: toconnor $ $Date: 2003-09-10 10:45:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,7 +83,9 @@ import java.awt.event.ActionListener;
 
 import org.w3c.dom.Document;
 
-import org.openoffice.idesupport.xml.ParcelDescriptor;
+import com.sun.star.script.framework.browse.ScriptEntry;
+import com.sun.star.script.framework.browse.ParcelDescriptor;
+
 import org.openoffice.idesupport.zip.ParcelZipper;
 
 public class ConfigurePanel extends JPanel {

scripting/java/org/openoffice/idesupport/ui/MethodPanel.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MethodPanel.java,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: npower $ $Date: 2003-03-03 18:42:22 $
+ *  last change: $Author: toconnor $ $Date: 2003-09-10 10:45:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,7 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.MalformedURLException;
 
-import org.openoffice.idesupport.ScriptEntry;
+import com.sun.star.script.framework.browse.ScriptEntry;
 import org.openoffice.idesupport.MethodFinder;
 import org.openoffice.idesupport.ExtensionFinder;
 import org.openoffice.idesupport.JavaFinder;

scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScriptPanel.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-01-16 17:47:56 $
+ *  last change: $Author: toconnor $ $Date: 2003-09-10 10:45:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,7 @@ import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableColumn;
 import javax.swing.table.AbstractTableModel;
 
-import org.openoffice.idesupport.ScriptEntry;
+import com.sun.star.script.framework.browse.ScriptEntry;
 
 public class ScriptPanel extends JPanel {
     private ScriptTableModel model;

scripting/java/org/openoffice/idesupport/xml/Manifest.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Manifest.java,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-03-12 18:26:29 $
+ *  last change: $Author: toconnor $ $Date: 2003-09-10 10:45:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Element;
 
+import com.sun.star.script.framework.browse.XMLParserFactory;
+
 public class Manifest {
 
     private Document document = null;

scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ParcelZipper.java,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-03-12 18:26:30 $
+ *  last change: $Author: toconnor $ $Date: 2003-09-10 10:45:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,8 @@ import org.openoffice.idesupport.filter.FileFilter;
 import org.openoffice.idesupport.filter.BinaryOnlyFilter;
 import org.openoffice.idesupport.filter.ExceptParcelFilter;
 
+import com.sun.star.script.framework.browse.ParcelDescriptor;
 import org.openoffice.idesupport.xml.Manifest;
-import org.openoffice.idesupport.xml.ParcelDescriptor;
 
 public class ParcelZipper
 {