[ooo-build-commit] ooeclipse: Branch 'master' - 3 commits
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Fri Oct 9 14:16:45 PDT 2009
core/source/org/openoffice/ide/eclipse/core/builders/messages.properties | 5
core/source/org/openoffice/ide/eclipse/core/gui/ConnectionConfigPanel.java | 7
core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java | 123 --
core/source/org/openoffice/ide/eclipse/core/gui/messages.properties | 2
core/source/org/openoffice/ide/eclipse/core/gui/rows/AbstractConfigRow.java | 59 -
core/source/org/openoffice/ide/eclipse/core/gui/rows/ChoiceRow.java | 2
core/source/org/openoffice/ide/eclipse/core/gui/rows/OOoRow.java | 2
core/source/org/openoffice/ide/eclipse/core/gui/rows/SdkRow.java | 2
core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties | 1
core/source/org/openoffice/ide/eclipse/core/launch/messages.properties | 1
core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties | 7
core/source/org/openoffice/ide/eclipse/core/wizards/pages/BaseUnoConnectionPage.java | 21
core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java | 40
java/lib/jodconnector.jar |binary
java/lib/slf4j-api-1.5.6.jar |binary
java/lib/slf4j-jdk14-1.5.6.jar |binary
java/plugin.xml | 9
java/source/org/openoffice/ide/eclipse/java/OOoJavaPlugin.java | 1
java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java | 5
java/source/org/openoffice/ide/eclipse/java/build/messages.properties | 7
java/source/org/openoffice/ide/eclipse/java/client/AUTHORS.txt.tpl | 6
java/source/org/openoffice/ide/eclipse/java/client/AbstractConnection.java.tpl | 142 --
java/source/org/openoffice/ide/eclipse/java/client/ClientWizard.java | 27
java/source/org/openoffice/ide/eclipse/java/client/ClientWizardPageOne.java | 14
java/source/org/openoffice/ide/eclipse/java/client/CnxProjectHelper.java | 181 ---
java/source/org/openoffice/ide/eclipse/java/client/Connection.java.tpl | 53 -
java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java | 203 ++++
java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java | 119 ++
java/source/org/openoffice/ide/eclipse/java/client/LICENSE.txt.tpl | 504 ----------
java/source/org/openoffice/ide/eclipse/java/client/OpenOfficeException.java.tpl | 29
java/source/org/openoffice/ide/eclipse/java/client/PipeConnection.java.tpl | 32
java/source/org/openoffice/ide/eclipse/java/client/SocketConnection.java.tpl | 29
java/source/org/openoffice/ide/eclipse/java/client/UnoClient.java.tpl | 8
java/source/org/openoffice/ide/eclipse/java/client/UnoConnectionPage.java | 4
java/source/org/openoffice/ide/eclipse/java/client/license-jodconnector.txt.tpl | 504 ++++++++++
java/source/org/openoffice/ide/eclipse/java/client/license-openoffice.org.txt.tpl | 13
java/source/org/openoffice/ide/eclipse/java/client/license-slf4j.txt.tpl | 24
java/source/org/openoffice/ide/eclipse/java/client/messages.properties | 2
java/source/org/openoffice/ide/eclipse/java/messages.properties | 9
java/source/org/openoffice/ide/eclipse/java/utils/messages.properties | 1
40 files changed, 1019 insertions(+), 1179 deletions(-)
New commits:
commit 21fc29d704b5c62feb291fb05bf39ee2055d1fce
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Oct 9 23:18:03 2009 +0200
I18n strings maintainance
Added new strings and removed unused ones
diff --git a/core/source/org/openoffice/ide/eclipse/core/builders/messages.properties b/core/source/org/openoffice/ide/eclipse/core/builders/messages.properties
index f7d39c9..78b2912 100644
--- a/core/source/org/openoffice/ide/eclipse/core/builders/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/builders/messages.properties
@@ -1,8 +1,3 @@
-ServicesBuilder.BuildServiceTask=Build service
-ServicesBuilder.ComponentBuildError=Failed to build the component
-ServicesBuilder.CreationJob=Services creation job
-ServicesBuilder.OuputReadError=Error reading the error output
IdlcErrorReader.ErrorReadingError=Impossible to read the error output
IdlcErrorReader.MarkerCreationError=Marker creation failed for file:
-ServicesBuilder.NotIdlProjectError=The project isn't a UNO-IDL one.
TypesBuilder.BuildError0=Error during UNO types build
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/ConnectionConfigPanel.java b/core/source/org/openoffice/ide/eclipse/core/gui/ConnectionConfigPanel.java
index 3486340..f22ad93 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/ConnectionConfigPanel.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/ConnectionConfigPanel.java
@@ -45,6 +45,7 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Layout;
import org.eclipse.swt.widgets.Text;
@@ -148,8 +149,10 @@ public class ConnectionConfigPanel {
if ( layout instanceof GridLayout ) {
int layoutColumns = ((GridLayout)layout).numColumns;
- Composite body = new Composite( pParent, SWT.NONE );
- GridData gd = new GridData( SWT.FILL, SWT.FILL, true, true );
+ Group body = new Group( pParent, SWT.NONE );
+ body.setText( Messages.getString("ConnectionConfigPanel.GroupTitle") ); //$NON-NLS-1$
+
+ GridData gd = new GridData( SWT.FILL, SWT.BEGINNING, true, false );
gd.horizontalSpan = layoutColumns;
body.setLayoutData( gd );
body.setLayout( new GridLayout( 2, false ) );
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java b/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
index 8ac88dc..a3299cc 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
@@ -30,7 +30,11 @@
************************************************************************/
package org.openoffice.ide.eclipse.core.gui;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
import org.openoffice.ide.eclipse.core.gui.rows.OOoRow;
import org.openoffice.ide.eclipse.core.gui.rows.SdkRow;
@@ -42,6 +46,8 @@ import org.openoffice.ide.eclipse.core.gui.rows.SdkRow;
*/
public class OOoConfigPanel {
+ private static final int GRID_COLUMNS = 3;
+
private SdkRow mSdkRow;
private OOoRow mOOoRow;
@@ -52,8 +58,13 @@ public class OOoConfigPanel {
*/
public OOoConfigPanel ( Composite pParent ) {
- mSdkRow = new SdkRow( pParent, new String(), null );
- mOOoRow = new OOoRow( pParent, new String(), null );
+ Group group = new Group( pParent, SWT.NONE );
+ group.setText( Messages.getString("OOoConfigPanel.GroupTitle") ); //$NON-NLS-1$
+ group.setLayout( new GridLayout( GRID_COLUMNS, false ) );
+ group.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, true, false ) );
+
+ mSdkRow = new SdkRow( group, new String(), null );
+ mOOoRow = new OOoRow( group, new String(), null );
}
/**
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties b/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties
index 43be7e4..dadaab9 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties
@@ -1,12 +1,14 @@
AbstractTable.Add=Add
AbstractTable.Del=Del
ConnectionConfigPanel.CnxTypeLabel=Connection type
+ConnectionConfigPanel.GroupTitle=Connection parameters
ConnectionConfigPanel.Host=Host
ConnectionConfigPanel.Name=Name
ConnectionConfigPanel.Pipe=Pipe
ConnectionConfigPanel.Port=Port
ConnectionConfigPanel.Socket=Socket
LocaleDialog.Title=Locale
+OOoConfigPanel.GroupTitle=OpenOffice.org instance and SDK
OOoTable.Title=Available OpenOffice.org installations
OOoTable.NameTitle=Name
OOoTable.PathTitle=Path to OOo installation
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties b/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties
index 5389f5f..4783344 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties
@@ -10,4 +10,3 @@ OOoRow.Browse=Configure OpenOffice.org...
OOoRow.Label=OpenOffice.org
OOoRow.DialogTitle=Configure OOos
AbstractConfigRow.Label=configuration
-AbstractConfigRow.BrowseButton=Browse
diff --git a/core/source/org/openoffice/ide/eclipse/core/launch/messages.properties b/core/source/org/openoffice/ide/eclipse/core/launch/messages.properties
index 55d95cb..4e0a2c3 100644
--- a/core/source/org/openoffice/ide/eclipse/core/launch/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/launch/messages.properties
@@ -11,4 +11,3 @@ UreTab.MainImplementationLabel=XMain implementation
UreTab.MainImplementationChooserTitle=Main implementation chooser
UreTab.MainImplementationChooserMessage=Select the implementation of XMain to run
UreLaunchDelegate.ErrorMessage=Problem during component's library creation
-UreLaunchDelegate.LaunchTaskTitle={0}...
diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties b/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties
index 16516d4..d281cea 100644
--- a/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties
@@ -33,6 +33,7 @@ NewServiceWizardPage.Type=Service name
NewUreAppWizard.Description=Create a new URE based application.
NewUnoProjectPage.Language=Programming language
NewUnoProjectPage.LanguageTooltip=Defines the implementation language.
+NewUnoProjectPage.LayoutGroupTitle=Project layout
NewUnoProjectPage.CustomDirsLabel=Use custom project directories
NewInterfaceWizard.InterfaceCreationError=Interface creation failed
NewInterfaceWizardPage.InterfaceDescription=Configures the new interface to create. A UNO interface can inherit from one or more other interfaces.
@@ -51,6 +52,7 @@ NewUnoProjectPage.CustomSourcesLabel=Sources
NewScopedElementWizardPage.Published=Published. Defines wether the type is stable \
enought to be used by client code.
NewUnoProjectPage.InvalidCompError=Implementation extension is a single word which begin with a letter and can contain numbers
+NewUnoProjectPage.UnoGroupTitle=UNO Project parameters
NewUnoFilePage.WrongExtensionError=A UNO-IDL file has the .idl extension
NewScopedElementWizardPage.Package=Module:
NewScopedElementWizardPage.PackageTooltip=Defines the sub-modules name which will contain the new type,\neg: "sub::module". This value is optional.
@@ -95,6 +97,5 @@ PackageExportWizardPage.WrongDestinationError=Invalid or missing destination dir
ServiceWizardSet.WrongInitDataWarning=Wrong data for service page set initizalization
ServiceWizardSet.ServiceCreationError=Error happened during service creation
ServiceWizardSet.IsIdlTypeExistingWarning=Error determining if the idl file exists: {0}
-UnoConnectionPage.ConnectionLabel=OpenOffice.org and SDK for building
-UnoConnectionPage.Description=Set some important informations for the UNO development
-UnoConnectionPage.Title=UNO configuration
+BaseUnoConnectionPage.Description=Set some important informations for the UNO development
+BaseUnoConnectionPage.Title=UNO configuration
diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/BaseUnoConnectionPage.java b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/BaseUnoConnectionPage.java
index af0d48c..74a1875 100644
--- a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/BaseUnoConnectionPage.java
+++ b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/BaseUnoConnectionPage.java
@@ -35,7 +35,6 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
import org.openoffice.ide.eclipse.core.gui.ConnectionConfigPanel;
import org.openoffice.ide.eclipse.core.gui.OOoConfigPanel;
import org.openoffice.ide.eclipse.core.model.OOoContainer;
@@ -54,8 +53,6 @@ import org.openoffice.ide.eclipse.core.wizards.Messages;
*
*/
public class BaseUnoConnectionPage extends WizardPage {
-
- private static final int LAYOUT_COLUMNS = 3;
private OOoConfigPanel mOOoConfigPanel;
private ConnectionConfigPanel mCnxConfigPanel;
@@ -65,8 +62,8 @@ public class BaseUnoConnectionPage extends WizardPage {
*/
public BaseUnoConnectionPage( ) {
super( "unocnxpage" ); //$NON-NLS-1$
- setTitle( Messages.getString("UnoConnectionPage.Title") ); //$NON-NLS-1$
- setDescription( Messages.getString("UnoConnectionPage.Description") ); //$NON-NLS-1$
+ setTitle( Messages.getString("BaseUnoConnectionPage.Title") ); //$NON-NLS-1$
+ setDescription( Messages.getString("BaseUnoConnectionPage.Description") ); //$NON-NLS-1$
}
/**
@@ -75,23 +72,11 @@ public class BaseUnoConnectionPage extends WizardPage {
public void createControl(Composite pParent) {
Composite body = new Composite( pParent, SWT.NONE );
- body.setLayout( new GridLayout( LAYOUT_COLUMNS, false ) );
+ body.setLayout( new GridLayout( ) );
body.setLayoutData( new GridData( GridData.FILL_BOTH ) );
- // Add a title label here
- Label confLbl = new Label( body, SWT.NONE );
- GridData gd = new GridData( GridData.FILL_HORIZONTAL );
- gd.horizontalSpan = LAYOUT_COLUMNS;
- confLbl.setLayoutData( gd );
- confLbl.setText( Messages.getString("UnoConnectionPage.ConnectionLabel") ); //$NON-NLS-1$
-
mOOoConfigPanel = new OOoConfigPanel( body );
- Label sep = new Label( body, SWT.SEPARATOR | SWT.HORIZONTAL );
- gd = new GridData( SWT.FILL, SWT.CENTER, true, false );
- gd.horizontalSpan = LAYOUT_COLUMNS;
- sep.setLayoutData( gd );
-
mCnxConfigPanel = new ConnectionConfigPanel( body );
setControl( body );
}
diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java
index f60ca9a..21cd392 100755
--- a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java
+++ b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java
@@ -65,6 +65,7 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
@@ -332,33 +333,35 @@ public class NewUnoProjectPage extends WizardNewProjectCreationPage
Composite control = (Composite)getControl();
+ Composite body = new Composite( control, SWT.None );
+ body.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
+ body.setLayout( new GridLayout() );
+
// Listens to name and directory changes
addTextListener(control);
- Composite body = new Composite(control, SWT.NONE);
- body.setFont( pParent.getFont() );
- body.setLayout(new GridLayout(LabeledRow.LAYOUT_COLUMNS, false));
- body.setLayoutData(new GridData(GridData.FILL_BOTH));
+ Group prjGroup = new Group(body, SWT.NONE);
+ prjGroup.setText( Messages.getString("NewUnoProjectPage.UnoGroupTitle") ); //$NON-NLS-1$
+ prjGroup.setFont( pParent.getFont() );
+ prjGroup.setLayout(new GridLayout(LabeledRow.LAYOUT_COLUMNS, false));
+ prjGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
// Add the company prefix field
- mPrefixRow = new TextRow(body, PREFIX,
+ mPrefixRow = new TextRow(prjGroup, PREFIX,
Messages.getString("NewUnoProjectPage.RootPackage")); //$NON-NLS-1$
mPrefixRow.setValue("org.openoffice.example"); // Setting default value //$NON-NLS-1$
mPrefixRow.setFieldChangedListener(this);
mPrefixRow.setTooltip(Messages.getString("NewUnoProjectPage.RootPackageTooltip")); //$NON-NLS-1$
// Add the output directory field
- mOutputExt = new TextRow(body, OUTPUT_EXT,
+ mOutputExt = new TextRow(prjGroup, OUTPUT_EXT,
Messages.getString("NewUnoProjectPage.CompExtension")); //$NON-NLS-1$
mOutputExt.setValue("comp"); // Setting default value //$NON-NLS-1$
mOutputExt.setFieldChangedListener(this);
mOutputExt.setTooltip(Messages.getString("NewUnoProjectPage.CompExtensionTooltip")); //$NON-NLS-1$
- mOOoConfigPanel = new OOoConfigPanel( body );
-
-
// Adding the programming language row
- mLanguageRow = new ChoiceRow(body, LANGUAGE,
+ mLanguageRow = new ChoiceRow(prjGroup, LANGUAGE,
Messages.getString("NewUnoProjectPage.Language"), null, false); //$NON-NLS-1$
mLanguageRow.setTooltip(Messages.getString("NewUnoProjectPage.LanguageTooltip")); //$NON-NLS-1$
@@ -371,7 +374,10 @@ public class NewUnoProjectPage extends WizardNewProjectCreationPage
mLanguageRow.setFieldChangedListener(this);
- addCustomDirsControls(body);
+ mOOoConfigPanel = new OOoConfigPanel( body );
+
+
+ addCustomDirsControls( body );
}
/**
@@ -380,20 +386,26 @@ public class NewUnoProjectPage extends WizardNewProjectCreationPage
* @param pParent the parent composite where to create the controls.
*/
private void addCustomDirsControls(Composite pParent) {
+
+ Group group = new Group( pParent, SWT.NONE );
+ group.setText( Messages.getString("NewUnoProjectPage.LayoutGroupTitle") ); //$NON-NLS-1$
+ group.setLayout( new GridLayout( 2, false ) );
+ group.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, true, false ) );
+
// Add the custom directories checkbox
- mCustomDirsRow = new BooleanRow(pParent, CUSTOM_DIRS,
+ mCustomDirsRow = new BooleanRow(group, CUSTOM_DIRS,
Messages.getString("NewUnoProjectPage.CustomDirsLabel")); //$NON-NLS-1$
mCustomDirsRow.setFieldChangedListener(this);
// Add the custom source directory chooser
- mSourceRow = new TextRow(pParent, CUSTOM_SRC,
+ mSourceRow = new TextRow(group, CUSTOM_SRC,
Messages.getString("NewUnoProjectPage.CustomSourcesLabel")); //$NON-NLS-1$
mSourceRow.setValue(UnoidlProjectHelper.SOURCE_BASIS);
mSourceRow.setEnabled(false);
mSourceRow.setFieldChangedListener(this);
// Add the custom idl directory chooser
- mIdlDirRow = new TextRow(pParent, CUSTOM_IDL,
+ mIdlDirRow = new TextRow(group, CUSTOM_IDL,
Messages.getString("NewUnoProjectPage.CustomIdlLabel")); //$NON-NLS-1$
mIdlDirRow.setValue(UnoidlProjectHelper.IDL_BASIS);
mIdlDirRow.setEnabled(false);
diff --git a/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java b/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
index fb4f000..6539ebd 100644
--- a/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
+++ b/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
@@ -258,7 +258,7 @@ public class OOoContainerPage extends WizardPage implements
} catch (JavaModelException e) {
PluginLogger.error(
- Messages.getString("Language.ClasspathSetFailed"), e); //$NON-NLS-1$
+ Messages.getString("OOoContainerPage.ClasspathSetFailed"), e); //$NON-NLS-1$
}
}
}
diff --git a/java/source/org/openoffice/ide/eclipse/java/build/messages.properties b/java/source/org/openoffice/ide/eclipse/java/build/messages.properties
index e724a12..1cfc986 100644
--- a/java/source/org/openoffice/ide/eclipse/java/build/messages.properties
+++ b/java/source/org/openoffice/ide/eclipse/java/build/messages.properties
@@ -1,3 +1,5 @@
+JODContainerPage.SLF4JLabel=Add the SLF4J JDK14 implementation
+JODContainerPage.Title=OpenOffice.org UNO Connector
OOoClasspathContainer.LibrariesName={0} libraries
OOoContainerPage.DialogDescription=OpenOffice.org Library edition page
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java b/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java
index f8839d4..dd0c0d0 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java
+++ b/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java
@@ -154,7 +154,7 @@ public class JODContainer extends ClasspathContainerInitializer {
libs[i] = JavaCore.newLibraryEntry( libPath, srcPath, null );
} catch ( Exception e ) {
- PluginLogger.error( "Failed to get library: " + lib, e );
+ PluginLogger.error( Messages.getString("JODContainer.GetLibraryError") + lib, e ); //$NON-NLS-1$
}
}
@@ -165,7 +165,7 @@ public class JODContainer extends ClasspathContainerInitializer {
* {@inheritDoc}
*/
public String getDescription() {
- return "OpenOffice.org UNO connector";
+ return Messages.getString("JODContainer.Description"); //$NON-NLS-1$
}
/**
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java b/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java
index c785cbe..0269ed1 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java
+++ b/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java
@@ -64,7 +64,7 @@ public class JODContainerPage extends WizardPage implements
public JODContainerPage( ) {
super( "jodcontainer" ); //$NON-NLS-1$
- setTitle( "OpenOffice.org UNO Connector" );
+ setTitle( Messages.getString("JODContainerPage.Title") ); //$NON-NLS-1$
ImageDescriptor image = OOoJavaPlugin.getImageDescriptor(
Messages.getString("OOoContainerPage.DialogImage")); //$NON-NLS-1$
setImageDescriptor(image);
@@ -104,7 +104,7 @@ public class JODContainerPage extends WizardPage implements
body.setLayout( new GridLayout( LAYOUT_COLS, false ) );
// SLF4J boolean row
- mSlf4jRow = new BooleanRow( body, new String(), "Add the SLF4J JDK14 implementation" );
+ mSlf4jRow = new BooleanRow( body, new String(), Messages.getString("JODContainerPage.SLF4JLabel") ); //$NON-NLS-1$
mSlf4jRow.setValue( mSlf4j );
mSlf4jRow.setFieldChangedListener( new IFieldChangedListener() {
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/messages.properties b/java/source/org/openoffice/ide/eclipse/java/client/messages.properties
index cb3a33d..e2ee782 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/messages.properties
+++ b/java/source/org/openoffice/ide/eclipse/java/client/messages.properties
@@ -2,3 +2,5 @@ ClientWizard.CreationJobTitle=Java UNO client creation
ClientWizard.ProjectCreated=Project created
ClientWizard.ProjectCreationError=Error creating UNO client application
ClientWizard.Title=Java UNO Client wizard
+JODContainer.Description=OpenOffice.org UNO connector
+JODContainer.GetLibraryError=Failed to get library:
diff --git a/java/source/org/openoffice/ide/eclipse/java/messages.properties b/java/source/org/openoffice/ide/eclipse/java/messages.properties
index 879aa3c..a49c3f6 100644
--- a/java/source/org/openoffice/ide/eclipse/java/messages.properties
+++ b/java/source/org/openoffice/ide/eclipse/java/messages.properties
@@ -1,13 +1,9 @@
Language.JavaNatureSet=Java nature set
Language.NatureSettingFailed=Setting Java nature failed
Language.UnreadableOutputError=Unreadable output error
-Language.ClasspathSetFailed=Error while setting the project classpath
Language.CreateCodeError=Code generation failed
Language.GetClasspathError=Failed to get the project classpath
JavaWizardPage.IncludeTestClasses=Include base classes for tests
-JavaWizardPage.InvalidClassNameError=Not a valid class name
-JavaWizardPage.RegistrationClassName=Registration class name
-JavaWizardPage.RegistrationClassNameTooltip=Defines the implementation name of the service.
JavaWizardPage.JavaVersion=Java version
JavaWizardPage.JavaVersionTooltip=Defines the minimal required java version of the project.
JavaWizardPage.PageTitle=Java implementation configuration
diff --git a/java/source/org/openoffice/ide/eclipse/java/utils/messages.properties b/java/source/org/openoffice/ide/eclipse/java/utils/messages.properties
index 654f160..23b1150 100644
--- a/java/source/org/openoffice/ide/eclipse/java/utils/messages.properties
+++ b/java/source/org/openoffice/ide/eclipse/java/utils/messages.properties
@@ -1,4 +1,3 @@
TemplatesHelper.ErrorPattern=Error during {0} creation [{1}]
TemplatesHelper.ReadError=reading template
-TemplatesHelper.WriteError=writing class
ZipContentHelper.NotDirectoryError=Not a directory:
commit 4ff6699e5781a4d794960759dad6f9d942f2dd12
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Oct 9 22:33:55 2009 +0200
[Core]Fixed some OOo and SDK rows problems
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java b/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
index f95dc99..8ac88dc 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
@@ -30,16 +30,9 @@
************************************************************************/
package org.openoffice.ide.eclipse.core.gui;
-import java.util.Vector;
-
import org.eclipse.swt.widgets.Composite;
import org.openoffice.ide.eclipse.core.gui.rows.OOoRow;
import org.openoffice.ide.eclipse.core.gui.rows.SdkRow;
-import org.openoffice.ide.eclipse.core.model.OOoContainer;
-import org.openoffice.ide.eclipse.core.model.SDKContainer;
-import org.openoffice.ide.eclipse.core.model.config.IConfigListener;
-import org.openoffice.ide.eclipse.core.model.config.IOOo;
-import org.openoffice.ide.eclipse.core.model.config.ISdk;
/**
* Class providing the OOo and SDK configuration rows.
@@ -48,20 +41,9 @@ import org.openoffice.ide.eclipse.core.model.config.ISdk;
*
*/
public class OOoConfigPanel {
-
- private static final String SDK = "__sdk"; //$NON-NLS-1$
- private static final String OOO = "__ooo"; //$NON-NLS-1$
- /**
- * SDK used for the project selection row.
- */
private SdkRow mSdkRow;
-
- /**
- * OOo used for the project selection row.
- */
private OOoRow mOOoRow;
- private ConfigListener mConfigListener;
/**
* Constructor.
@@ -70,19 +52,16 @@ public class OOoConfigPanel {
*/
public OOoConfigPanel ( Composite pParent ) {
- OOoContainer.addListener( mConfigListener );
- SDKContainer.addListener( mConfigListener );
-
- mSdkRow = new SdkRow( pParent, SDK, null );
- mOOoRow = new OOoRow( pParent, OOO, null );
+ mSdkRow = new SdkRow( pParent, new String(), null );
+ mOOoRow = new OOoRow( pParent, new String(), null );
}
/**
* Disposes the object, mainly to unregister the listeners.
*/
public void dispose( ) {
- OOoContainer.removeListener( mConfigListener );
- SDKContainer.removeListener( mConfigListener );
+ mOOoRow.dispose();
+ mSdkRow.dispose();
}
/**
@@ -106,89 +85,4 @@ public class OOoConfigPanel {
}
return oooName;
}
-
- /**
- * Set the SDK names to the SDK list-box.
- */
- private void fillSDKRow () {
-
- if (null != mSdkRow) {
- // Adding the SDK names to the combo box
- String[] sdks = new String[SDKContainer.getSDKCount()];
- Vector<String> sdkKeys = SDKContainer.getSDKKeys();
- for (int i = 0, length = SDKContainer.getSDKCount(); i < length; i++) {
- sdks[i] = sdkKeys.get(i);
- }
-
- mSdkRow.removeAll();
- mSdkRow.addAll(sdks);
- // The default SDK is randomly the first one
- mSdkRow.select(0);
- }
- }
-
- /**
- * Set the OOo names to the OOo list-box.
- */
- private void fillOOoRow() {
-
- if (null != mOOoRow) {
-
- // Adding the OOo names to the combo box
- String[] ooos = new String[OOoContainer.getOOoCount()];
- Vector<String> oooKeys = OOoContainer.getOOoKeys();
- for (int i = 0, length = OOoContainer.getOOoCount(); i < length; i++) {
- ooos[i] = oooKeys.get(i);
- }
-
- mOOoRow.removeAll();
- mOOoRow.addAll(ooos);
- // The default OOo is randomly the first one
- mOOoRow.select(0);
- }
- }
-
- /**
- * Class listening for the OOo and SDK config changes and updating the fields.
- *
- * @author cbosdonnat
- *
- */
- private class ConfigListener implements IConfigListener {
- /**
- * {@inheritDoc}
- */
- public void ConfigAdded(Object pElement) {
- if (pElement instanceof IOOo) {
- fillOOoRow();
- } else {
- fillSDKRow();
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public void ConfigRemoved(Object pElement) {
-
- if (null == pElement || pElement instanceof IOOo) {
- fillOOoRow();
- }
-
- if (null == pElement || pElement instanceof ISdk) {
- fillSDKRow();
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public void ConfigUpdated(Object pElement) {
- if (pElement instanceof IOOo) {
- fillOOoRow();
- } else {
- fillSDKRow();
- }
- };
- }
}
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/AbstractConfigRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/AbstractConfigRow.java
index e664c8f..b60692a 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/AbstractConfigRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/AbstractConfigRow.java
@@ -61,7 +61,7 @@ import org.openoffice.ide.eclipse.core.model.config.IConfigListener;
*/
public abstract class AbstractConfigRow extends ChoiceRow {
- private IConfigListener mConfigListener;
+ private IConfigListener mConfigListener = new ConfigListener();
/**
* Constructor.
@@ -91,7 +91,12 @@ public abstract class AbstractConfigRow extends ChoiceRow {
}
});
- fillRow(pSelection);
+ fillRow( );
+ if ( pSelection != null ) {
+ select( getElementName( pSelection ) );
+ } else {
+ select( 0 );
+ }
}
/**
@@ -128,27 +133,20 @@ public abstract class AbstractConfigRow extends ChoiceRow {
/**
* Computes the name to use to select the given object.
*
- * @param pToSelect the configuration object to select
+ * @param pElement the configuration object for which to get the name
* @return the name to use for the selection
*/
- protected abstract String getSelectionName(Object pToSelect);
+ protected abstract String getElementName(Object pElement);
/**
* Fills the row with the existing values from the configuration.
- *
- * @param pToSelect the configuration object to select
*/
- private void fillRow(Object pToSelect) {
+ private void fillRow( ) {
String[] values = getConfigValues();
removeAll();
addAll(values);
- if (null != pToSelect) {
- select(getSelectionName(pToSelect));
- } else {
- select(0);
- }
}
/**
@@ -209,4 +207,41 @@ public abstract class AbstractConfigRow extends ChoiceRow {
savePreferences();
}
}
+
+ /**
+ * Class listening for the OOo and SDK config changes and updating the fields.
+ *
+ * @author cbosdonnat
+ *
+ */
+ private class ConfigListener implements IConfigListener {
+ /**
+ * {@inheritDoc}
+ */
+ public void ConfigAdded(Object pElement) {
+ fillRow( );
+ select( getElementName( pElement ) );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void ConfigRemoved(Object pElement) {
+ String value = getValue();
+ fillRow( );
+
+ // Select the previous selection if it hasn't been removed
+ if ( pElement != null && !value.equals( getElementName( pElement ) ) ) {
+ select( value );
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void ConfigUpdated(Object pElement) {
+ fillRow( );
+ select( getElementName( pElement ) );
+ };
+ }
}
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/ChoiceRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/ChoiceRow.java
index 769c1f0..51dd38d 100755
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/ChoiceRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/ChoiceRow.java
@@ -290,6 +290,8 @@ public class ChoiceRow extends LabeledRow {
i++;
}
cField.select(result);
+ mSelected = result;
+ fireFieldChangedEvent( new FieldEvent( mProperty, pValue ) );
}
/**
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/OOoRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/OOoRow.java
index e9f7fd2..7c316b4 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/OOoRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/OOoRow.java
@@ -115,7 +115,7 @@ public class OOoRow extends AbstractConfigRow {
* {@inheritDoc}
*/
@Override
- protected String getSelectionName(Object pToSelect) {
+ protected String getElementName(Object pToSelect) {
return ((IOOo)pToSelect).getName();
}
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/SdkRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/SdkRow.java
index 9064702..dc74fd2 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/SdkRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/SdkRow.java
@@ -126,7 +126,7 @@ public class SdkRow extends AbstractConfigRow {
* {@inheritDoc}
*/
@Override
- protected String getSelectionName(Object pToSelect) {
+ protected String getElementName(Object pToSelect) {
return ((ISdk)pToSelect).getId();
}
commit 5a239c58c5d53ad1afcc0def83787e24390c2df9
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Oct 9 22:32:59 2009 +0200
[Java] Uno client: moved the JOD code into a jar
Less problems regarding the licenses stuffs, but also the project
generation configuration.
diff --git a/java/lib/jodconnector.jar b/java/lib/jodconnector.jar
new file mode 100644
index 0000000..904f470
Binary files /dev/null and b/java/lib/jodconnector.jar differ
diff --git a/java/lib/slf4j-api-1.5.6.jar b/java/lib/slf4j-api-1.5.6.jar
new file mode 100644
index 0000000..d794252
Binary files /dev/null and b/java/lib/slf4j-api-1.5.6.jar differ
diff --git a/java/lib/slf4j-jdk14-1.5.6.jar b/java/lib/slf4j-jdk14-1.5.6.jar
new file mode 100644
index 0000000..1ce0a28
Binary files /dev/null and b/java/lib/slf4j-jdk14-1.5.6.jar differ
diff --git a/java/plugin.xml b/java/plugin.xml
index e9e7f82..7343ff0 100644
--- a/java/plugin.xml
+++ b/java/plugin.xml
@@ -26,6 +26,10 @@
class="org.openoffice.ide.eclipse.java.build.OooClasspathContainerInitializer"
id="org.openoffice.ide.eclipse.java.OOO_CONTAINER">
</classpathContainerInitializer>
+ <classpathContainerInitializer
+ class="org.openoffice.ide.eclipse.java.client.JODContainer"
+ id="org.openoffice.ide.eclipse.java.JOD_CONTAINER">
+ </classpathContainerInitializer>
</extension>
<extension
point="org.eclipse.jdt.ui.classpathContainerPage">
@@ -34,6 +38,11 @@
id="org.openoffice.ide.eclipse.java.OOO_CONTAINER"
name="OpenOffice.org Libraries">
</classpathContainerPage>
+ <classpathContainerPage
+ class="org.openoffice.ide.eclipse.java.client.JODContainerPage"
+ id="org.openoffice.ide.eclipse.java.JOD_CONTAINER"
+ name="OpenOffice.org UNO connector">
+ </classpathContainerPage>
</extension>
<extension
point="org.eclipse.ui.newWizards">
diff --git a/java/source/org/openoffice/ide/eclipse/java/OOoJavaPlugin.java b/java/source/org/openoffice/ide/eclipse/java/OOoJavaPlugin.java
index 1e139e3..62a5fe1 100644
--- a/java/source/org/openoffice/ide/eclipse/java/OOoJavaPlugin.java
+++ b/java/source/org/openoffice/ide/eclipse/java/OOoJavaPlugin.java
@@ -55,6 +55,7 @@ public class OOoJavaPlugin extends AbstractUIPlugin {
public static final String PLUGIN_ID = "org.openoffice.ide.eclipse.java"; //$NON-NLS-1$
public static final String WIZBAN = "wizban"; //$NON-NLS-1$
+ public static final String LIBS_DIR = "lib/"; //$NON-NLS-1$
//The shared instance.
private static OOoJavaPlugin sPlugin;
diff --git a/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java b/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
index 1278107..fb4f000 100644
--- a/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
+++ b/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
@@ -64,7 +64,6 @@ import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
import org.openoffice.ide.eclipse.core.model.OOoContainer;
import org.openoffice.ide.eclipse.core.model.ProjectsManager;
import org.openoffice.ide.eclipse.core.model.config.IOOo;
-import org.openoffice.ide.eclipse.java.Messages;
import org.openoffice.ide.eclipse.java.OOoJavaPlugin;
/**
@@ -228,7 +227,7 @@ public class OOoContainerPage extends WizardPage implements
pProject.setRawClasspath(entries, null);
} catch (JavaModelException e) {
PluginLogger.error(
- Messages.getString("Language.ClasspathSetFailed"), e); //$NON-NLS-1$
+ Messages.getString("OOoContainerPage.ClasspathSetFailed"), e); //$NON-NLS-1$
}
}
}
diff --git a/java/source/org/openoffice/ide/eclipse/java/build/messages.properties b/java/source/org/openoffice/ide/eclipse/java/build/messages.properties
index 9002160..e724a12 100644
--- a/java/source/org/openoffice/ide/eclipse/java/build/messages.properties
+++ b/java/source/org/openoffice/ide/eclipse/java/build/messages.properties
@@ -1 +1,6 @@
OOoClasspathContainer.LibrariesName={0} libraries
+
+OOoContainerPage.DialogDescription=OpenOffice.org Library edition page
+OOoContainerPage.DialogImage=/icons/library_wiz.png
+OOoContainerPage.DialogTitle=OpenOffice.org Libraries
+OOoContainerPage.ClasspathSetFailed=Error while setting the project classpath
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/AUTHORS.txt.tpl b/java/source/org/openoffice/ide/eclipse/java/client/AUTHORS.txt.tpl
deleted file mode 100644
index 8a8be93..0000000
--- a/java/source/org/openoffice/ide/eclipse/java/client/AUTHORS.txt.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-This project has been automatically generated by the OOEclipse plugins.
-
-The code contained by this project has been developed by Mirko Nasato and
-is part of the JODConverter (http://www.artofsolving.com/opensource/jodconverter).
-
-Copyright (C) 2004-2007 - Mirko Nasato <mirko at artofsolving.com>
\ No newline at end of file
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/AbstractConnection.java.tpl b/java/source/org/openoffice/ide/eclipse/java/client/AbstractConnection.java.tpl
deleted file mode 100644
index f1fe970..0000000
--- a/java/source/org/openoffice/ide/eclipse/java/client/AbstractConnection.java.tpl
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// JODConverter - Java OpenDocument Converter
-// Copyright (C) 2004-2007 - Mirko Nasato <mirko at artofsolving.com>
-//
-// 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.
-// http://www.gnu.org/copyleft/lesser.html
-//
-// Contributor:
-// Laurent Godard <lgodard at nuxeo.com>
-//
-package {0};
-
-import java.net.ConnectException;
-
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.bridge.XBridge;
-import com.sun.star.bridge.XBridgeFactory;
-import com.sun.star.comp.helper.Bootstrap;
-import com.sun.star.connection.NoConnectException;
-import com.sun.star.connection.XConnection;
-import com.sun.star.connection.XConnector;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.lang.EventObject;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XEventListener;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.ucb.XFileIdentifierConverter;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-
-public abstract class AbstractConnection implements Connection, XEventListener '{'
-
- private String connectionString;
- private XComponent bridgeComponent;
- private XMultiComponentFactory serviceManager;
- private XComponentContext componentContext;
- private XBridge bridge;
- private boolean connected = false;
- private boolean expectingDisconnection = false;
-
- protected AbstractConnection(String connectionString) '{'
- this.connectionString = connectionString;
- }
-
- public synchronized void connect() throws ConnectException '{'
- System.err.println("connecting");
- try '{'
- XComponentContext localContext = Bootstrap.createInitialComponentContext(null);
- XMultiComponentFactory localServiceManager = localContext.getServiceManager();
- XConnector connector = (XConnector) UnoRuntime.queryInterface(XConnector.class,
- localServiceManager.createInstanceWithContext("com.sun.star.connection.Connector", localContext));
- XConnection connection = connector.connect(connectionString);
- XBridgeFactory bridgeFactory = (XBridgeFactory) UnoRuntime.queryInterface(XBridgeFactory.class,
- localServiceManager.createInstanceWithContext("com.sun.star.bridge.BridgeFactory", localContext));
- bridge = bridgeFactory.createBridge("", "urp", connection, null);
- bridgeComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, bridge);
- bridgeComponent.addEventListener(this);
- serviceManager = (XMultiComponentFactory) UnoRuntime.queryInterface(XMultiComponentFactory.class,
- bridge.getInstance("StarOffice.ServiceManager"));
- XPropertySet properties = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, serviceManager);
- componentContext = (XComponentContext) UnoRuntime.queryInterface(XComponentContext.class,
- properties.getPropertyValue("DefaultContext"));
- connected = true;
- System.err.println("connected");
- } catch (NoConnectException connectException) '{'
- throw new ConnectException("connection failed: "+ connectionString +": " + connectException.getMessage());
- } catch (Exception exception) '{'
- throw new OpenOfficeException("connection failed: "+ connectionString, exception);
- }
- }
-
- public synchronized void disconnect() '{'
- System.err.println("disconnecting");
- expectingDisconnection = true;
- bridgeComponent.dispose();
- }
-
- public boolean isConnected() '{'
- return connected;
- }
-
- public void disposing(EventObject event) '{'
- connected = false;
- if (expectingDisconnection) '{'
- System.err.println("disconnected");
- } else '{'
- System.err.println("disconnected unexpectedly");
- }
- expectingDisconnection = false;
- }
-
- // for unit tests only
- void simulateUnexpectedDisconnection() '{'
- disposing(null);
- if ( bridgeComponent != null ) '{'
- bridgeComponent.dispose();
- }
- }
-
- private Object getService(String className) '{'
- try '{'
- if (!connected) '{'
- System.err.println("trying to (re)connect");
- connect();
- }
- return serviceManager.createInstanceWithContext(className, componentContext);
- } catch (Exception exception) '{'
- throw new OpenOfficeException("could not obtain service: " + className, exception);
- }
- }
-
- public XComponentLoader getDesktop() '{'
- return (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class,
- getService("com.sun.star.frame.Desktop"));
- }
-
- public XFileIdentifierConverter getFileContentProvider() '{'
- return (XFileIdentifierConverter) UnoRuntime.queryInterface(XFileIdentifierConverter.class,
- getService("com.sun.star.ucb.FileContentProvider"));
- }
-
- public XBridge getBridge() '{'
- return bridge;
- }
-
- public XMultiComponentFactory getRemoteServiceManager() '{'
- return serviceManager;
- }
-
- public XComponentContext getComponentContext() '{'
- return componentContext;
- }
-
-}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/ClientWizard.java b/java/source/org/openoffice/ide/eclipse/java/client/ClientWizard.java
index f2bbc04..f2e388e 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/ClientWizard.java
+++ b/java/source/org/openoffice/ide/eclipse/java/client/ClientWizard.java
@@ -42,7 +42,6 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.ui.wizards.NewJavaProjectWizardPageOne;
import org.eclipse.jdt.ui.wizards.NewJavaProjectWizardPageTwo;
import org.eclipse.ui.IWorkbenchPage;
@@ -50,7 +49,6 @@ import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
import org.openoffice.ide.eclipse.core.PluginLogger;
import org.openoffice.ide.eclipse.core.utils.WorkbenchHelper;
import org.openoffice.ide.eclipse.java.OOoJavaPlugin;
-import org.openoffice.ide.eclipse.java.build.OOoContainerPage;
import org.openoffice.ide.eclipse.java.utils.TemplatesHelper;
/**
@@ -63,6 +61,12 @@ public class ClientWizard extends BasicNewResourceWizard {
private static final String DEST_PACKAGE = "org.openoffice.client"; //$NON-NLS-1$
private static final String CLIENT_CLASS = "UnoClient"; //$NON-NLS-1$
+ private static final String LICENSE_DIR = "third-party licenses"; //$NON-NLS-1$
+ private static final String[] LICENSE_FILES = new String[] {
+ "license-jodconnector.txt", //$NON-NLS-1$
+ "license-openoffice.org.txt", //$NON-NLS-1$
+ "license-slf4j.txt", //$NON-NLS-1$
+ };
private IWorkbenchPage mActivePage;
@@ -128,8 +132,13 @@ public class ClientWizard extends BasicNewResourceWizard {
TemplatesHelper.copyTemplate( prj, CLIENT_CLASS + TemplatesHelper.JAVA_EXT,
ClientWizard.class, path, DEST_PACKAGE, mCnxPage.getConnectionCode() );
- // Add the OpenOffice.org libraries to the project
- OOoContainerPage.addOOoDependencies( mCnxPage.getOoo(), pJavaProject );
+ // Copy the third-party licenses
+ IFolder licensesFolder = prj.getFolder( LICENSE_DIR );
+ licensesFolder.create( true, true, pMonitor );
+ IPath licPath = licensesFolder.getProjectRelativePath();
+ for ( String license : LICENSE_FILES ) {
+ TemplatesHelper.copyTemplate( prj, license, ClientWizard.class, licPath.toString() );
+ }
// Refresh the project
try {
@@ -142,16 +151,6 @@ public class ClientWizard extends BasicNewResourceWizard {
IFile javaClientFile = srcDir.getFile( CLIENT_CLASS + ".java" ); //$NON-NLS-1$
selectAndReveal( javaClientFile );
WorkbenchHelper.showFile( javaClientFile, mActivePage );
-
- // Create the Uno connection project
- IJavaProject cnxPrj = CnxProjectHelper.getConnectionProject( mCnxPage.getOoo(), pMonitor );
- if ( cnxPrj != null ) {
- IClasspathEntry[] oldClasspath = pJavaProject.getRawClasspath();
- IClasspathEntry[] classpath = new IClasspathEntry[ oldClasspath.length + 1 ];
- classpath[0] = JavaCore.newProjectEntry( cnxPrj.getProject().getFullPath() );
- System.arraycopy( oldClasspath, 0, classpath, 1, oldClasspath.length );
- pJavaProject.setRawClasspath( classpath, pMonitor );
- }
}
@Override
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/ClientWizardPageOne.java b/java/source/org/openoffice/ide/eclipse/java/client/ClientWizardPageOne.java
index aa54169..666eb8e 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/ClientWizardPageOne.java
+++ b/java/source/org/openoffice/ide/eclipse/java/client/ClientWizardPageOne.java
@@ -65,14 +65,20 @@ public class ClientWizardPageOne extends NewJavaProjectWizardPageOne {
@Override
public IClasspathEntry[] getDefaultClasspathEntries() {
IClasspathEntry[] oldEntries = super.getDefaultClasspathEntries();
- IClasspathEntry[] entries = new IClasspathEntry[ oldEntries.length + 1 ];
-
- System.arraycopy( oldEntries, 0, entries, 0, oldEntries.length );
IOOo ooo = mCnxPage.getOoo();
IPath path = new Path(OOoClasspathContainer.ID + IPath.SEPARATOR + ooo.getName());
IClasspathEntry oooEntry = JavaCore.newContainerEntry(path);
- entries[ entries.length - 1 ] = oooEntry;
+
+ IClasspathEntry[] newEntries = new IClasspathEntry[] {
+ oooEntry,
+ JODContainer.createClasspathEntry( true )
+ };
+
+ IClasspathEntry[] entries = new IClasspathEntry[ oldEntries.length + newEntries.length ];
+
+ System.arraycopy( oldEntries, 0, entries, 0, oldEntries.length );
+ System.arraycopy( newEntries, 0, entries, oldEntries.length, newEntries.length );
return entries;
}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/CnxProjectHelper.java b/java/source/org/openoffice/ide/eclipse/java/client/CnxProjectHelper.java
deleted file mode 100644
index df6903b..0000000
--- a/java/source/org/openoffice/ide/eclipse/java/client/CnxProjectHelper.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * the GNU Lesser General Public License Version 2.1
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2009 by Cédric Bosdonnat
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * 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
- *
- * The Initial Developer of the Original Code is: Cédric Bosdonnat.
- *
- * Copyright: 2009 by Cédric Bosdonnat.
- *
- * All Rights Reserved.
- *
- ************************************************************************/
-package org.openoffice.ide.eclipse.java.client;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.openoffice.ide.eclipse.core.model.config.IOOo;
-import org.openoffice.ide.eclipse.java.JavaProjectHandler;
-import org.openoffice.ide.eclipse.java.OOoJavaPlugin;
-import org.openoffice.ide.eclipse.java.utils.TemplatesHelper;
-
-/**
- * Helper class for the creation of the UNO connection library project.
- *
- * @author cbosdonnat
- *
- */
-public class CnxProjectHelper {
-
- public static final String DEST_PACKAGE = "org.openoffice.connection"; //$NON-NLS-1$
-
- private static final String LICENSE_FILE = "LICENSE.txt"; //$NON-NLS-1$
- private static final String AUTHORS_FILE = "AUTHORS.txt"; //$NON-NLS-1$
- private static final String[] HELPER_CLASSES = {
- "AbstractConnection", //$NON-NLS-1$
- "Connection", //$NON-NLS-1$
- "OpenOfficeException", //$NON-NLS-1$
- "PipeConnection", //$NON-NLS-1$
- "SocketConnection" //$NON-NLS-1$
- };
-
- // TODO Should be configured ?
- private static final String CNX_PROJECT_NAME = "Java Uno Connector"; //$NON-NLS-1$
- private static final String SRC_DIR = "src"; //$NON-NLS-1$
- private static final String BIN_DIR = "bin"; //$NON-NLS-1$
-
-
- /**
- * Get the java project named {@value #CNX_PROJECT_NAME} if it exists or create it.
- *
- * <p>This project contains the LGPL library for the UNO Connection and should
- * be used as a dependency of the Java UNO Client projects.</p>
- *
- * @param pOOo the OOo instance to use as project's dependencies
- * @param pMonitor a progress monitor to use for reporting the progress
- *
- * @return the connector project
- *
- * @throws Exception if the project can't be created or opened
- */
- public static IJavaProject getConnectionProject( IOOo pOOo, IProgressMonitor pMonitor ) throws Exception {
-
- IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject( CNX_PROJECT_NAME );
-
- boolean creating = false;
- if ( !prj.exists() ) {
- IProjectDescription desc = ResourcesPlugin.getWorkspace().newProjectDescription( CNX_PROJECT_NAME );
- desc.setNatureIds( new String[] { JavaCore.NATURE_ID } );
- prj.create( desc, pMonitor );
- creating = true;
- }
-
- if ( !prj.isOpen() ) {
- // Opens the project if it is closed
- prj.open( pMonitor );
- }
-
- // Create the src folder if not existing
- IFolder src = prj.getFolder( SRC_DIR );
- if ( !src.exists() ) {
- src.create( true, true, pMonitor );
- }
-
- IFolder bin = prj.getFolder( BIN_DIR );
- if ( !bin.exists() ) {
- bin.create( true, true, pMonitor );
- }
-
- IJavaProject cnxPrj = null;
- // Create & configure the java project
- if ( creating ) {
- cnxPrj = JavaCore.create( prj );
- IClasspathEntry srcEntry = JavaCore.newSourceEntry( src.getFullPath() );
- IClasspathEntry jreEntry = JavaRuntime.getDefaultJREContainerEntry();
- cnxPrj.setRawClasspath( new IClasspathEntry[] { srcEntry, jreEntry }, pMonitor );
- cnxPrj.setOutputLocation( bin.getFullPath(), pMonitor );
- cnxPrj.save( pMonitor, true );
-
- JavaProjectHandler prjHandler = new JavaProjectHandler();
- prjHandler.addOOoDependencies( pOOo, prj );
-
- // Set the Java builder
- setJavaBuilder( prj, pMonitor );
-
- // Add the sources
- String path = src.getProjectRelativePath().append( DEST_PACKAGE.replace( '.', '/' ) ).toString();
- for ( String helperClass : HELPER_CLASSES ) {
- TemplatesHelper.copyTemplate( prj, helperClass + TemplatesHelper.JAVA_EXT,
- ClientWizard.class, path, DEST_PACKAGE );
- }
-
- TemplatesHelper.copyTemplate( prj, LICENSE_FILE,
- CnxProjectHelper.class, null );
- TemplatesHelper.copyTemplate( prj, AUTHORS_FILE,
- CnxProjectHelper.class, null );
-
- prj.refreshLocal( IResource.DEPTH_INFINITE, pMonitor );
- } else if ( prj.hasNature( JavaCore.NATURE_ID ) ) {
- cnxPrj = JavaCore.create( prj );
- } else {
- throw new CoreException( new Status( IStatus.ERROR, OOoJavaPlugin.PLUGIN_ID,
- "Already existing non-Java project: " + CNX_PROJECT_NAME ) );
- }
-
- return cnxPrj;
- }
-
-
- /**
- * Add the Java builder to the the project builders.
- *
- * @param pPrj the project on which to add the Java builder
- * @param pMonitor the monitor to report the progress
- *
- * @throws CoreException if the project's description can't be get or set
- */
- private static void setJavaBuilder(IProject pPrj, IProgressMonitor pMonitor) throws CoreException {
- IProjectDescription descr = pPrj.getDescription();
- ICommand[] builders = descr.getBuildSpec();
- ICommand[] newCommands = new ICommand[builders.length + 1];
-
- ICommand typesbuilderCommand = descr.newCommand();
- typesbuilderCommand.setBuilderName( JavaCore.BUILDER_ID );
- newCommands[0] = typesbuilderCommand;
-
- System.arraycopy( builders, 0, newCommands, 1, builders.length );
-
- descr.setBuildSpec( newCommands );
- pPrj.setDescription( descr, pMonitor );
- }
-}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/Connection.java.tpl b/java/source/org/openoffice/ide/eclipse/java/client/Connection.java.tpl
deleted file mode 100644
index 675031a..0000000
--- a/java/source/org/openoffice/ide/eclipse/java/client/Connection.java.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// JODConverter - Java OpenDocument Converter
-// Copyright (C) 2004-2007 - Mirko Nasato <mirko at artofsolving.com>
-//
-// 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.
-// http://www.gnu.org/copyleft/lesser.html
-//
-package {0};
-
-import java.net.ConnectException;
-
-import com.sun.star.bridge.XBridge;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.ucb.XFileIdentifierConverter;
-import com.sun.star.uno.XComponentContext;
-
-/**
- * A UNO remote protocol connection to a listening OpenOffice.org instance
- */
-public interface Connection '{'
-
- public void connect() throws ConnectException;
-
- public void disconnect();
-
- public boolean isConnected();
-
- /**
- * @return the com.sun.star.frame.Desktop service
- */
- public XComponentLoader getDesktop();
-
- /**
- * @return the com.sun.star.ucb.FileContentProvider service
- */
- public XFileIdentifierConverter getFileContentProvider();
-
- public XBridge getBridge();
-
- public XMultiComponentFactory getRemoteServiceManager();
-
- public XComponentContext getComponentContext();
-
-}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java b/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java
new file mode 100644
index 0000000..f8839d4
--- /dev/null
+++ b/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java
@@ -0,0 +1,203 @@
+/*************************************************************************
+ *
+ * The Contents of this file are made available subject to the terms of
+ * the GNU Lesser General Public License Version 2.1
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2009 by Cédric Bosdonnat
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is: Cédric Bosdonnat.
+ *
+ * Copyright: 2009 by Cédric Bosdonnat.
+ *
+ * All Rights Reserved.
+ *
+ ************************************************************************/
+package org.openoffice.ide.eclipse.java.client;
+
+import java.io.File;
+import java.net.URL;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.ClasspathContainerInitializer;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.openoffice.ide.eclipse.core.PluginLogger;
+import org.openoffice.ide.eclipse.java.OOoJavaPlugin;
+
+/**
+ * Provides JODConnector and its dependencies as a library container.
+ *
+ * @author cbosdonnat
+ *
+ */
+public class JODContainer extends ClasspathContainerInitializer {
+
+ public static final String ID = "org.openoffice.ide.eclipse.java.JOD_CONTAINER"; //$NON-NLS-1$
+ public static final String WITH_SLF4J_IMPL = "slf4j-impl"; //$NON-NLS-1$
+
+ private static final String SLF4J_IMPL_LIBNAME = "slf4j-jdk14-1.5.6.jar"; //$NON-NLS-1$
+ private static final String JODCONNECTOR_LIBNAME = "jodconnector.jar"; //$NON-NLS-1$
+
+ private static final String[] LIBS = new String[] {
+ JODCONNECTOR_LIBNAME,
+ "slf4j-api-1.5.6.jar" //$NON-NLS-1$
+ };
+
+ /**
+ * Default constructor.
+ */
+ public JODContainer( ) {
+ }
+
+ @Override
+ public void initialize(IPath pContainerPath, IJavaProject pProject)
+ throws CoreException {
+
+ boolean withSlf4jImpl = checkSlf4jImpl( pContainerPath );
+
+ JODClasspathContainer container = new JODClasspathContainer( withSlf4jImpl );
+
+ IJavaProject[] projects = new IJavaProject[]{pProject};
+ IClasspathContainer[] containers = new IClasspathContainer[]{container};
+
+ JavaCore.setClasspathContainer(pContainerPath, projects, containers, null);
+ }
+
+ /**
+ * Check if the container path needs to include SLF4J implementation.
+ *
+ * @param pContainerPath the path to check
+ *
+ * @return <code>true</code> if SLF4J has to be included
+ */
+ public static boolean checkSlf4jImpl(IPath pContainerPath) {
+ return pContainerPath.segmentCount() > 1 && pContainerPath.segment( 1 ).equals( WITH_SLF4J_IMPL );
+ }
+
+ /**
+ * Utility method to get the container entry.
+ *
+ * @param pWithSlf4jImpl <code>true</code> to add the SLF4J jdk14 implementation
+ *
+ * @return the container entry
+ */
+ public static IClasspathEntry createClasspathEntry( boolean pWithSlf4jImpl ) {
+ IPath path = new Path( JODContainer.ID );
+ if ( pWithSlf4jImpl ) {
+ path = path.append( WITH_SLF4J_IMPL );
+ }
+
+ return JavaCore.newContainerEntry( path );
+ }
+
+ /**
+ * Class implementing the JOD libraries container.
+ *
+ * @author cbosdonnat
+ *
+ */
+ public class JODClasspathContainer implements IClasspathContainer {
+
+ private boolean mSlf4jImpl;
+
+ /**
+ * Constructor.
+ *
+ * @param pWithSlf4jImpl <code>true</code> to add the SLF4J jdk14 implementation
+ */
+ public JODClasspathContainer( boolean pWithSlf4jImpl ) {
+ mSlf4jImpl = pWithSlf4jImpl;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public IClasspathEntry[] getClasspathEntries() {
+
+ String[] libsNames = getLibs( );
+
+ IClasspathEntry[] libs = new IClasspathEntry[ libsNames.length ];
+ for ( int i = 0; i < libsNames.length; i++ ) {
+ String lib = libsNames[i];
+ try {
+ URL libUrl = OOoJavaPlugin.getDefault().getBundle().getResource(
+ OOoJavaPlugin.LIBS_DIR + lib );
+ URL libFileUrl = FileLocator.toFileURL( libUrl );
+ File libFile = new File( libFileUrl.toURI() );
+ IPath libPath = Path.fromOSString( libFile.toString() );
+
+ IPath srcPath = null;
+ if ( lib.equals( JODCONNECTOR_LIBNAME ) ) {
+ srcPath = libPath;
+ }
+
+ libs[i] = JavaCore.newLibraryEntry( libPath, srcPath, null );
+ } catch ( Exception e ) {
+ PluginLogger.error( "Failed to get library: " + lib, e );
+ }
+ }
+
+ return libs;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getDescription() {
+ return "OpenOffice.org UNO connector";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getKind() {
+ return K_APPLICATION;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public IPath getPath() {
+ return new Path( ID );
+ }
+
+ /**
+ * @return the libraries names to add to the container.
+ */
+ private String[] getLibs( ) {
+ int libsCount = LIBS.length;
+ if ( mSlf4jImpl ) {
+ libsCount++;
+ }
+
+ String[] allLibs = new String[ libsCount ];
+ System.arraycopy( LIBS, 0, allLibs, 0, LIBS.length );
+
+ if ( mSlf4jImpl ) {
+ allLibs[ allLibs.length - 1 ] = SLF4J_IMPL_LIBNAME;
+ }
+ return allLibs;
+ }
+ }
+}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java b/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java
new file mode 100644
index 0000000..c785cbe
--- /dev/null
+++ b/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ * The Contents of this file are made available subject to the terms of
+ * the GNU Lesser General Public License Version 2.1
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2009 by Cédric Bosdonnat
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is: Cédric Bosdonnat.
+ *
+ * Copyright: 2009 by Cédric Bosdonnat.
+ *
+ * All Rights Reserved.
+ *
+ ************************************************************************/
+package org.openoffice.ide.eclipse.java.client;
+
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.openoffice.ide.eclipse.core.gui.rows.BooleanRow;
+import org.openoffice.ide.eclipse.core.gui.rows.FieldEvent;
+import org.openoffice.ide.eclipse.core.gui.rows.IFieldChangedListener;
+import org.openoffice.ide.eclipse.java.OOoJavaPlugin;
+import org.openoffice.ide.eclipse.java.build.Messages;
+
+/**
+ * JOD Connector configuration page.
+ *
+ * @author cbosdonnat
+ *
+ */
+public class JODContainerPage extends WizardPage implements
+ IClasspathContainerPage {
+
+ private static final int LAYOUT_COLS = 2;
+
+ private BooleanRow mSlf4jRow;
+
+ private boolean mSlf4j;
+
+ /**
+ * Needed default constructor.
+ */
+ public JODContainerPage( ) {
+ super( "jodcontainer" ); //$NON-NLS-1$
+
+ setTitle( "OpenOffice.org UNO Connector" );
+ ImageDescriptor image = OOoJavaPlugin.getImageDescriptor(
+ Messages.getString("OOoContainerPage.DialogImage")); //$NON-NLS-1$
+ setImageDescriptor(image);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean finish() {
+ // Nothing to do
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public IClasspathEntry getSelection() {
+ return JODContainer.createClasspathEntry( mSlf4j );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setSelection(IClasspathEntry pContainerEntry) {
+ if ( pContainerEntry != null ) {
+ mSlf4j = JODContainer.checkSlf4jImpl( pContainerEntry.getPath() );
+ } else {
+ mSlf4j = true;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void createControl( Composite pParent ) {
+ Composite body = new Composite( pParent, SWT.NONE );
+ body.setLayout( new GridLayout( LAYOUT_COLS, false ) );
+
+ // SLF4J boolean row
+ mSlf4jRow = new BooleanRow( body, new String(), "Add the SLF4J JDK14 implementation" );
+ mSlf4jRow.setValue( mSlf4j );
+ mSlf4jRow.setFieldChangedListener( new IFieldChangedListener() {
+
+ public void fieldChanged(FieldEvent pEvent) {
+ mSlf4j = mSlf4jRow.getBooleanValue();
+ }
+ });
+
+ setControl( body );
+ }
+
+}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/LICENSE.txt.tpl b/java/source/org/openoffice/ide/eclipse/java/client/LICENSE.txt.tpl
deleted file mode 100644
index 1837b0a..0000000
--- a/java/source/org/openoffice/ide/eclipse/java/client/LICENSE.txt.tpl
+++ /dev/null
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/OpenOfficeException.java.tpl b/java/source/org/openoffice/ide/eclipse/java/client/OpenOfficeException.java.tpl
deleted file mode 100644
index 6cb68ce..0000000
--- a/java/source/org/openoffice/ide/eclipse/java/client/OpenOfficeException.java.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// JODConverter - Java OpenDocument Converter
-// Copyright (C) 2004-2007 - Mirko Nasato <mirko at artofsolving.com>
-//
-// 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.
-// http://www.gnu.org/copyleft/lesser.html
-//
-package {0};
-
-public class OpenOfficeException extends RuntimeException '{'
-
- private static final long serialVersionUID = 1L;
-
- public OpenOfficeException(String message) '{'
- super(message);
- }
-
- public OpenOfficeException(String message, Throwable cause) '{'
- super(message, cause);
- }
-}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/PipeConnection.java.tpl b/java/source/org/openoffice/ide/eclipse/java/client/PipeConnection.java.tpl
deleted file mode 100644
index 81efdc1..0000000
--- a/java/source/org/openoffice/ide/eclipse/java/client/PipeConnection.java.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// JODConverter - Java OpenDocument Converter
-// Copyright (C) 2004-2007 - Mirko Nasato <mirko at artofsolving.com>
-//
-// 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.
-// http://www.gnu.org/copyleft/lesser.html
-//
-package {0};
-
-/**
- * OpenOffice connection using a named pipe
- * <p>
- * <b>Warning!</b> This requires the <i>sal3</i> native library shipped with OpenOffice.org;
- * it must be made available via the <i>java.library.path</i> parameter, e.g.
- * <pre>
- * java -Djava.library.path=/opt/openoffice.org/program my.App
- * </pre>
- */
-public class PipeConnection extends AbstractConnection '{'
-
- public PipeConnection(String pipeName) '{'
- super("pipe,name="+ pipeName);
- }
-}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/SocketConnection.java.tpl b/java/source/org/openoffice/ide/eclipse/java/client/SocketConnection.java.tpl
deleted file mode 100644
index 0ca779a..0000000
--- a/java/source/org/openoffice/ide/eclipse/java/client/SocketConnection.java.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// JODConverter - Java OpenDocument Converter
-// Copyright (C) 2004-2007 - Mirko Nasato <mirko at artofsolving.com>
-//
-// 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.
-// http://www.gnu.org/copyleft/lesser.html
-//
-package {0};
-
-public class SocketConnection extends AbstractConnection '{'
-
- public static final String DEFAULT_HOST = "localhost";
-
- public SocketConnection(int port) '{'
- this(DEFAULT_HOST, port);
- }
-
- public SocketConnection(String host, int port) '{'
- super("socket,host=" + host + ",port=" + port + ",tcpNoDelay=1");
- }
-}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/UnoClient.java.tpl b/java/source/org/openoffice/ide/eclipse/java/client/UnoClient.java.tpl
index de7e165..e4143b4 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/UnoClient.java.tpl
+++ b/java/source/org/openoffice/ide/eclipse/java/client/UnoClient.java.tpl
@@ -1,15 +1,15 @@
package {0};
-import org.openoffice.connection.AbstractConnection;
-import org.openoffice.connection.PipeConnection;
-import org.openoffice.connection.SocketConnection;
+import com.artofsolving.jodconverter.openoffice.connection.AbstractOpenOfficeConnection;
+import com.artofsolving.jodconverter.openoffice.connection.SocketOpenOfficeConnection;
+import com.artofsolving.jodconverter.openoffice.connection.PipeOpenOfficeConnection;
import com.sun.star.uno.XComponentContext;
public class UnoClient '{'
public static void main(String[] args) '{'
- AbstractConnection cnx = null;
+ AbstractOpenOfficeConnection cnx = null;
try '{'
{1}
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/UnoConnectionPage.java b/java/source/org/openoffice/ide/eclipse/java/client/UnoConnectionPage.java
index f846238..a49c5ff 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/UnoConnectionPage.java
+++ b/java/source/org/openoffice/ide/eclipse/java/client/UnoConnectionPage.java
@@ -41,8 +41,8 @@ import org.openoffice.ide.eclipse.core.wizards.pages.BaseUnoConnectionPage;
*/
public class UnoConnectionPage extends BaseUnoConnectionPage {
- private static final String PIPE_PATTERN = "cnx = new PipeConnection( \"{0}\" );"; //$NON-NLS-1$
- private static final String SOCKET_PATTERN = "cnx = new SocketConnection( \"{0}\", {1} );"; //$NON-NLS-1$
+ private static final String PIPE_PATTERN = "cnx = new PipeOpenOfficeConnection( \"{0}\" );"; //$NON-NLS-1$
+ private static final String SOCKET_PATTERN = "cnx = new SocketOpenOfficeConnection( \"{0}\", {1} );"; //$NON-NLS-1$
@Override
public void createControl(Composite pParent) {
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/license-jodconnector.txt.tpl b/java/source/org/openoffice/ide/eclipse/java/client/license-jodconnector.txt.tpl
new file mode 100644
index 0000000..5ab7695
--- /dev/null
+++ b/java/source/org/openoffice/ide/eclipse/java/client/license-jodconnector.txt.tpl
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/license-openoffice.org.txt.tpl b/java/source/org/openoffice/ide/eclipse/java/client/license-openoffice.org.txt.tpl
new file mode 100644
index 0000000..199b041
--- /dev/null
+++ b/java/source/org/openoffice/ide/eclipse/java/client/license-openoffice.org.txt.tpl
@@ -0,0 +1,13 @@
+You may only copy and distribute this program consistent with the requirements and distribute this
+Program consistent with the requirements of either the GNU General Public License (GPL) and
+GNU Lesser General Public License (LGPL), respectively, depending on whether you elected to obtain
+access to this program via the GPL/LGPL Option. Copies of the GPL and LGPL licenses can be found
+http://www.openoffice.org/project/www/license.html
+
+------------------------------------
+Third Party Code. Additional copyright notices and license terms applicable to portions of the
+Software are set forth in the THIRDPARTYLICENSEREADME.html file.
+
+------------------------------------
+Copyright 2002,2005 Sun Microsystems, Inc.
+
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/license-slf4j.txt.tpl b/java/source/org/openoffice/ide/eclipse/java/client/license-slf4j.txt.tpl
new file mode 100644
index 0000000..f6e2f31
--- /dev/null
+++ b/java/source/org/openoffice/ide/eclipse/java/client/license-slf4j.txt.tpl
@@ -0,0 +1,24 @@
+Copyright (c) 2004-2007 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
diff --git a/java/source/org/openoffice/ide/eclipse/java/messages.properties b/java/source/org/openoffice/ide/eclipse/java/messages.properties
index 0a2d00f..879aa3c 100644
--- a/java/source/org/openoffice/ide/eclipse/java/messages.properties
+++ b/java/source/org/openoffice/ide/eclipse/java/messages.properties
@@ -13,7 +13,4 @@ JavaWizardPage.JavaVersionTooltip=Defines the minimal required java version of t
JavaWizardPage.PageTitle=Java implementation configuration
JavaWizardPage.PageDescription=This page helps you to configure the java implementation skeleton creation.
JavaWizardPage.Java4=Java 1.4
-JavaWizardPage.Java5=Java 1.5
-OOoContainerPage.DialogDescription=OpenOffice.org Library edition page
-OOoContainerPage.DialogImage=/icons/library_wiz.png
-OOoContainerPage.DialogTitle=OpenOffice.org Libraries
+JavaWizardPage.Java5=Java 1.5
\ No newline at end of file
More information about the ooo-build-commit
mailing list