diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-23 16:11:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-23 16:20:17 +0100 |
| commit | 0b9fda25f321ce2697179064e330843237177668 (patch) | |
| tree | 9be4cf5c4cc7a6f0a6c5d0bf02ae09bd7cd87a5d /scripting/examples/java/selector | |
| parent | dd6c4f4db1d62268d73e09ae52d23f760a967dcc (diff) | |
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).
Diffstat (limited to 'scripting/examples/java/selector')
| -rw-r--r-- | scripting/examples/java/selector/ScriptSelector.java | 2 | ||||
| -rwxr-xr-x | scripting/examples/java/selector/parcel-descriptor.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripting/examples/java/selector/ScriptSelector.java b/scripting/examples/java/selector/ScriptSelector.java index 698faa5a6f04..93475fef8def 100644 --- a/scripting/examples/java/selector/ScriptSelector.java +++ b/scripting/examples/java/selector/ScriptSelector.java @@ -1,3 +1,5 @@ +package org.libreoffice.example.java_scripts; + import javax.swing.*; import javax.swing.tree.*; import javax.swing.table.*; diff --git a/scripting/examples/java/selector/parcel-descriptor.xml b/scripting/examples/java/selector/parcel-descriptor.xml index 8e3e70e8c60b..951fdde60c2b 100755 --- a/scripting/examples/java/selector/parcel-descriptor.xml +++ b/scripting/examples/java/selector/parcel-descriptor.xml @@ -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"/> |