fdo#46102: Fix Java script examples after gbuild'ification
...they contained no class files anymore, due to missing gb_Jar_set_packageroot calls. However, those calls only work for subdirectories, i.e., the example .java files need to be put into a package (I chose org.libreoffice.example.java_scripts) for all of them). This in turn required adaption of the parcel-descriptor.xml files; not sure what the logicalname entries there are good for if anything -- the macro names at "Tools - Macros - Run Macro..." now unfortunately(?) contain the fully qualified paths for the HelloWorld, HighlightText, and MemoryUpdate examples. There are additional examples at scripting/examples/java/ that apparently do not get packaged (but I adapted them anyway).
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import com.sun.star.script.provider.XScriptContext;
|
||||
import com.sun.star.uno.UnoRuntime;
|
||||
import com.sun.star.text.XTextDocument;
|
||||
|
@@ -7,7 +7,7 @@
|
||||
Prints "Helo World".
|
||||
</description>
|
||||
</locale>
|
||||
<functionname value="HelloWorld.printHW"/>
|
||||
<functionname value="org.libreoffice.example.java_scripts.HelloWorld.printHW"/>
|
||||
<logicalname value="HelloWorld.printHW"/>
|
||||
<languagedepprops>
|
||||
<prop name="classpath" value="HelloWorld.jar"/>
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import com.sun.star.uno.UnoRuntime;
|
||||
import com.sun.star.script.provider.XScriptContext;
|
||||
import com.sun.star.lang.XMultiComponentFactory;
|
||||
|
@@ -8,7 +8,7 @@
|
||||
Text highlighting
|
||||
</description>
|
||||
</locale>
|
||||
<functionname value="HighlightText.showForm"/>
|
||||
<functionname value="org.libreoffice.example.java_scripts.HighlightText.showForm"/>
|
||||
<logicalname value="HighlightText.showForm"/>
|
||||
<languagedepprops>
|
||||
<prop name="classpath" value="Highlight.jar"/>
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import java.util.Random;
|
||||
import java.util.Date;
|
||||
import com.sun.star.uno.UnoRuntime;
|
||||
|
@@ -7,7 +7,7 @@
|
||||
Text highlighting
|
||||
</description>
|
||||
</locale>
|
||||
<functionname value="MemoryUsage.updateMemoryUsage"/>
|
||||
<functionname value="org.libreoffice.example.java_scripts.MemoryUsage.updateMemoryUsage"/>
|
||||
<logicalname value="MemoryUtils.MemUsage"/>
|
||||
<languagedepprops>
|
||||
<prop name="classpath" value="MemoryUsage.jar"/>
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import com.sun.star.uno.UnoRuntime;
|
||||
import com.sun.star.lang.XMultiComponentFactory;
|
||||
import com.sun.star.uno.XComponentContext;
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
public class NewsGroup
|
||||
{
|
||||
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
//import com.sun.star.frame.XComponentLoader;
|
||||
import java.io.*;
|
||||
import com.sun.star.lang.XComponent;
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import javax.swing.*;
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import javax.mail.*;
|
||||
import javax.mail.internet.*;
|
||||
import com.msoft.mail.provider.nntp.NNTPTransport;
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import javax.swing.*;
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.Vector;
|
||||
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.io.IOException;
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JTextArea;
|
||||
import javax.swing.JPanel;
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import javax.swing.SwingUtilities;
|
||||
import java.io.InputStream;
|
||||
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import java.io.InputStream;
|
||||
import drafts.com.sun.star.script.framework.runtime.XScriptContext;
|
||||
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<description>Script that starts debuggers for JavaScript and BeanShell
|
||||
</description>
|
||||
</locale>
|
||||
<logicalname value="_$DebugRunner.Debug" />
|
||||
<logicalname value="org.libreoffice.example.java_scripts._$DebugRunner.Debug" />
|
||||
<functionname value="DebugRunner.go" />
|
||||
<languagedepprops>
|
||||
<prop name="classpath" value="debugger.jar"/>
|
||||
|
@@ -1,3 +1,5 @@
|
||||
package org.libreoffice.example.java_scripts;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.tree.*;
|
||||
import javax.swing.table.*;
|
||||
|
@@ -8,7 +8,7 @@
|
||||
Prototype Script Selector GUI for StarOffice
|
||||
</description>
|
||||
</locale>
|
||||
<functionname value="ScriptSelector.showOrganizer"/>
|
||||
<functionname value="org.libreoffice.example.java_scripts.ScriptSelector.showOrganizer"/>
|
||||
<logicalname value="ScriptSelector.showOrganizer"/>
|
||||
<languagedepprops>
|
||||
<prop name="classpath" value="selector.jar"/>
|
||||
|
Reference in New Issue
Block a user