[ooo-build-commit] ooeclipse: Branch 'master'
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Wed Oct 7 13:12:01 PDT 2009
core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java | 114 --
core/source/org/openoffice/ide/eclipse/core/gui/messages.properties | 9
core/source/org/openoffice/ide/eclipse/core/gui/rows/AbstractConfigRow.java | 5
core/source/org/openoffice/ide/eclipse/core/gui/rows/BooleanRow.java | 2
core/source/org/openoffice/ide/eclipse/core/gui/rows/ChoiceRow.java | 7
core/source/org/openoffice/ide/eclipse/core/gui/rows/DialogRow.java | 13
core/source/org/openoffice/ide/eclipse/core/gui/rows/FileRow.java | 4
core/source/org/openoffice/ide/eclipse/core/gui/rows/LabeledRow.java | 48
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/TextRow.java | 2
core/source/org/openoffice/ide/eclipse/core/gui/rows/TypeRow.java | 8
core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties | 4
core/source/org/openoffice/ide/eclipse/core/internal/helpers/UnoidlProjectHelper.java | 8
core/source/org/openoffice/ide/eclipse/core/model/language/IProjectHandler.java | 17
core/source/org/openoffice/ide/eclipse/core/preferences/MainPage.java | 2
core/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeBrowser.java | 2
core/source/org/openoffice/ide/eclipse/core/wizards/pages/InterfaceMemberDialog.java | 2
core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java | 5
core/source/org/openoffice/ide/eclipse/core/wizards/pages/PackageExportWizardPage.java | 4
cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java | 8
java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java | 45
java/source/org/openoffice/ide/eclipse/java/JavaWizardPage.java | 2
java/source/org/openoffice/ide/eclipse/java/client/AUTHORS.txt.tpl | 6
java/source/org/openoffice/ide/eclipse/java/client/ClientWizard.java | 10
java/source/org/openoffice/ide/eclipse/java/client/ClientWizardPageOne.java | 79 +
java/source/org/openoffice/ide/eclipse/java/client/CnxProjectHelper.java | 47
java/source/org/openoffice/ide/eclipse/java/client/LICENSE.txt.tpl | 504 ++++++++++
java/source/org/openoffice/ide/eclipse/java/registration/RegistrationHelper.java | 3
java/source/org/openoffice/ide/eclipse/java/tests/TestsHelper.java | 14
java/source/org/openoffice/ide/eclipse/java/utils/TemplatesHelper.java | 15
31 files changed, 767 insertions(+), 226 deletions(-)
New commits:
commit b5f1879aead85178724c08430710d51466f53c37
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Oct 7 21:51:47 2009 +0200
UI improvements, Java Client fixes
* Added the OOo library in the default libraries of the new uno client
wizard.
* Replaced the browse buttons by a link in some parts of the UI (thank you
Karl Weber for the idea).
* Uno client: some directories where created in the user's home
directory due to some wrong path conversion.
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 db4c408..f95dc99 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
@@ -32,15 +32,9 @@ package org.openoffice.ide.eclipse.core.gui;
import java.util.Vector;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.openoffice.ide.eclipse.core.gui.rows.ChoiceRow;
+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;
@@ -61,12 +55,12 @@ public class OOoConfigPanel {
/**
* SDK used for the project selection row.
*/
- private ChoiceRow mSdkRow;
+ private SdkRow mSdkRow;
/**
* OOo used for the project selection row.
*/
- private ChoiceRow mOOoRow;
+ private OOoRow mOOoRow;
private ConfigListener mConfigListener;
/**
@@ -79,43 +73,8 @@ public class OOoConfigPanel {
OOoContainer.addListener( mConfigListener );
SDKContainer.addListener( mConfigListener );
- // Add the SDK choice field
- mSdkRow = new ChoiceRow(pParent, SDK,
- Messages.getString("OOoConfigPanel.UsedSdk"), //$NON-NLS-1$
- Messages.getString("OOoConfigPanel.SdkBrowse")); //$NON-NLS-1$
- mSdkRow.setBrowseSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent pEvent) {
- super.widgetSelected(pEvent);
-
- // Open the SDK Configuration page
- TableDialog dialog = new TableDialog( Display.getDefault().getActiveShell(), true);
- dialog.create();
- dialog.open();
-
- }
- });
-
- fillSDKRow();
- mSdkRow.setTooltip(Messages.getString("OOoConfigPanel.SdkTooltip")); //$NON-NLS-1$
-
-
- // Add the OOo choice field
- mOOoRow = new ChoiceRow(pParent, OOO,
- Messages.getString("OOoConfigPanel.UsedOOo"), //$NON-NLS-1$
- Messages.getString("OOoConfigPanel.OOoBrowse")); //$NON-NLS-1$
- mOOoRow.setBrowseSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent pEvent) {
- super.widgetSelected(pEvent);
-
- // Open the OOo Configuration page
- TableDialog dialog = new TableDialog( Display.getDefault().getActiveShell(), false);
- dialog.create();
- dialog.open();
- }
- });
-
- fillOOoRow();
- mOOoRow.setTooltip(Messages.getString("OOoConfigPanel.OOoTooltip")); //$NON-NLS-1$
+ mSdkRow = new SdkRow( pParent, SDK, null );
+ mOOoRow = new OOoRow( pParent, OOO, null );
}
/**
@@ -232,65 +191,4 @@ public class OOoConfigPanel {
}
};
}
-
- /**
- * Dialog for OOo and SDK configuration.
- *
- * @author cedribosdo
- */
- private class TableDialog extends Dialog {
-
- private boolean mEditSdk = true;
-
- private Object mTable;
-
- /**
- * Constructor.
- *
- * @param pParentShell the parent shell of the dialog.
- * @param pEditSDK <code>true</code> for SDK, <code>false</code> for OOo edition.
- */
- TableDialog (Shell pParentShell, boolean pEditSDK) {
- super(pParentShell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
- mEditSdk = pEditSDK;
-
- // This dialog is a modal one
- setBlockOnOpen(true);
- if (pEditSDK) {
- getShell().setText(Messages.getString("OOoConfigPanel.SdkBrowse")); //$NON-NLS-1$
- } else {
- getShell().setText(Messages.getString("OOoConfigPanel.OOoBrowse")); //$NON-NLS-1$
- }
- }
-
- /**
- * {@inheritDoc}
- */
- protected Control createDialogArea(Composite pParent) {
-
- if (mEditSdk) {
- mTable = new SDKTable(pParent);
- ((SDKTable)mTable).getPreferences();
- } else {
- mTable = new OOoTable(pParent);
- ((OOoTable)mTable).getPreferences();
- }
-
- return pParent;
- }
-
- /**
- * {@inheritDoc}
- */
- protected void okPressed() {
- super.okPressed();
-
- if (mEditSdk) {
- ((SDKTable)mTable).savePreferences();
- } else {
- ((OOoTable)mTable).savePreferences();
- }
- }
- }
}
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 6a95bed..43be7e4 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties
@@ -20,11 +20,4 @@ SDKTable.PathTitle=Path to SDK
SDKTable.DialogTitle=OpenOffice.org SDK configuration
SDKTable.MissingFieldError=All the fields have to be filled
SDKTable.SpacesSdkPathWarning=The path of the SDK contains white spaces, the build might not work
-ProjectSelectionDialog.Title=Project content chooser
-
-OOoConfigPanel.UsedSdk=Used SDK
-OOoConfigPanel.SdkBrowse=Configure SDKs
-OOoConfigPanel.SdkTooltip=Defines the SDK to use for the project devevelopment.
-OOoConfigPanel.UsedOOo=Used OOo
-OOoConfigPanel.OOoBrowse=OOo installations
-OOoConfigPanel.OOoTooltip=Defines the OOo or URE instance for which the project is for.
\ No newline at end of file
+ProjectSelectionDialog.Title=Project content chooser
\ No newline at end of file
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 5ea74dc..e664c8f 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
@@ -68,12 +68,13 @@ public abstract class AbstractConfigRow extends ChoiceRow {
*
* @param pParent the composite where to create the row
* @param pProperty the property for the row events
+ * @param pBrowseText the text for the browse button/link
* @param pSelection the configuration element to select first
*/
- public AbstractConfigRow(final Composite pParent, String pProperty, Object pSelection) {
+ public AbstractConfigRow(final Composite pParent, String pProperty, String pBrowseText, Object pSelection) {
super(pParent, pProperty,
Messages.getString("AbstractConfigRow.Label"), //$NON-NLS-1$
- Messages.getString("AbstractConfigRow.BrowseButton")); //$NON-NLS-1$
+ pBrowseText, true);
addListener(mConfigListener);
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/BooleanRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/BooleanRow.java
index b58af49..bd8ff0a 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/BooleanRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/BooleanRow.java
@@ -81,7 +81,7 @@ public class BooleanRow extends LabeledRow {
Label text = new Label(pParent, SWT.NONE);
- createContent(pParent, checkbox,text, null);
+ createContent(pParent, checkbox,text, null, false);
}
/**
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 8d0a9d7..769c1f0 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
@@ -84,9 +84,10 @@ public class ChoiceRow extends LabeledRow {
* @param pProperty the property name of the row
* @param pLabel label the label to print on the left of the row
* @param pBrowse the label of the button
+ * @param pLink <code>true</code> to show a link for the browse button
*/
public ChoiceRow (Composite pParent, String pProperty, String pLabel,
- String pBrowse) {
+ String pBrowse, boolean pLink) {
super(pProperty);
@@ -114,7 +115,7 @@ public class ChoiceRow extends LabeledRow {
}
});
- createContent(pParent, aLabel, aField, pBrowse);
+ createContent(pParent, aLabel, aField, pBrowse, pLink);
if ( mBrowse != null ) {
numFields++;
@@ -133,7 +134,7 @@ public class ChoiceRow extends LabeledRow {
*/
public void setBrowseSelectionListener(SelectionListener pListener) {
if (null != mBrowse) {
- mBrowse.addSelectionListener(pListener);
+ addBrowseSelectionListener(pListener);
}
}
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/DialogRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/DialogRow.java
index 74eb4c8..d5938cb 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/DialogRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/DialogRow.java
@@ -69,9 +69,10 @@ public class DialogRow extends LabeledRow implements ModifyListener {
* @param pParent the composite in which to create the row
* @param pProperty the property to recognize an event from this row
* @param pLabel the label on the left of the row
+ * @param pLink tells whether to create a browse link or button
*/
- public DialogRow(Composite pParent, String pProperty, String pLabel) {
- this(pParent, pProperty, pLabel , Messages.getString("DialogRow.BrowseLabel")); //$NON-NLS-1$
+ public DialogRow(Composite pParent, String pProperty, String pLabel, boolean pLink) {
+ this(pParent, pProperty, pLabel , Messages.getString("DialogRow.BrowseLabel"), pLink); //$NON-NLS-1$
}
/**
@@ -81,18 +82,20 @@ public class DialogRow extends LabeledRow implements ModifyListener {
* @param pProperty the property to recognize an event from this row
* @param pLabel the label on the left of the row
* @param pBtnLabel the label of the button opening the dialog
+ * @param pLink tells whether to create a browse link or button
+ *
*/
- public DialogRow(Composite pParent, String pProperty, String pLabel, String pBtnLabel) {
+ public DialogRow(Composite pParent, String pProperty, String pLabel, String pBtnLabel, boolean pLink) {
super(pProperty);
Label aLabel = new Label(pParent, SWT.LEFT | SWT.SHADOW_NONE);
aLabel.setText(pLabel);
Text aField = new Text(pParent, SWT.BORDER);
- createContent(pParent, aLabel, aField, pBtnLabel);
+ createContent(pParent, aLabel, aField, pBtnLabel, pLink);
((Text)mField).addModifyListener(this);
- mBrowse.addSelectionListener(new SelectionAdapter() {
+ addBrowseSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent pEvent) {
String newValue = doOpenDialog();
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/FileRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/FileRow.java
index 2996553..47437eb 100755
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/FileRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/FileRow.java
@@ -88,7 +88,7 @@ public class FileRow extends LabeledRow {
Text aField = new Text(pParent, SWT.BORDER);
createContent(pParent, aLabel, aField,
- Messages.getString("FileRow.Browse")); //$NON-NLS-1$
+ Messages.getString("FileRow.Browse"), false); //$NON-NLS-1$
mField.addFocusListener(new FocusAdapter() {
public void focusLost(FocusEvent pEvent) {
@@ -96,7 +96,7 @@ public class FileRow extends LabeledRow {
}
});
- mBrowse.addSelectionListener(new SelectionAdapter() {
+ addBrowseSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent pEvent) {
browse();
}
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/LabeledRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/LabeledRow.java
index 6513c85..f6f8da5 100755
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/LabeledRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/LabeledRow.java
@@ -43,7 +43,10 @@
************************************************************************/
package org.openoffice.ide.eclipse.core.gui.rows;
+import java.text.MessageFormat;
+
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -51,6 +54,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Link;
/**
* Basic class for a property row. Subclasses will override:
@@ -75,7 +79,7 @@ public abstract class LabeledRow {
protected Control mLabel;
protected Control mField;
- protected Button mBrowse;
+ protected Control mBrowse;
protected String mProperty;
protected IFieldChangedListener mListener;
@@ -100,11 +104,13 @@ public abstract class LabeledRow {
* @param pField Control containing the field data.
* @param pBrowseText Button text. If <code>null</code>, the button isn't
* created.
+ * @param pLink the browse is shown as a link if <code>true</code>, otherwise
+ * it is a button.
*/
public LabeledRow(Composite pParent, String pProperty, Control pLabel,
- Control pField, String pBrowseText) {
+ Control pField, String pBrowseText, boolean pLink) {
this.mProperty = pProperty;
- createContent(pParent, pLabel, pField, pBrowseText);
+ createContent(pParent, pLabel, pField, pBrowseText, pLink);
}
/**
@@ -137,6 +143,20 @@ public abstract class LabeledRow {
}
/**
+ * Add a selection listener to the browse link or button (depends on the
+ * arguments of the constructor).
+ *
+ * @param pListener the listener to add
+ */
+ public void addBrowseSelectionListener( SelectionListener pListener ) {
+ if ( mBrowse instanceof Link ) {
+ ((Link) mBrowse).addSelectionListener( pListener );
+ } else if ( mBrowse instanceof Button ) {
+ ((Button) mBrowse).addSelectionListener( pListener );
+ }
+ }
+
+ /**
* Stores the row controls, creates the button if its text
* is not <code>null</code> and layout the controls.
*
@@ -144,14 +164,30 @@ public abstract class LabeledRow {
* @param pLabel the control for the label
* @param pField the control for the field
* @param pBrowseText the text to show on the right button of the row.
+ * @param pLink the browse is shown as a link if <code>true</code>, otherwise
+ * it is a button.
*/
protected void createContent(Composite pParent, Control pLabel,
- Control pField, String pBrowseText) {
+ Control pField, String pBrowseText, boolean pLink) {
+
this.mLabel = pLabel;
this.mField = pField;
if (null != pBrowseText) {
- mBrowse = new Button(pParent, SWT.PUSH);
- mBrowse.setText(pBrowseText);
+ if ( pLink ) {
+ Link link = new Link(pParent, SWT.NONE);
+ link.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
+ link.setFont(pParent.getFont());
+ String linkPattern = "<A>{0}</A>"; //$NON-NLS-1$
+ String linkedText = MessageFormat.format( linkPattern, pBrowseText );
+ link.setText( linkedText );
+ mBrowse = link;
+ } else {
+ Button btn = new Button(pParent, SWT.PUSH);
+ btn.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
+ btn.setText( pBrowseText );
+ mBrowse = btn;
+ }
+
}
fillRow(pParent);
}
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 e78b021..e9f7fd2 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
@@ -68,7 +68,7 @@ public class OOoRow extends AbstractConfigRow {
* @param pToSelect the configuration element to select first
*/
public OOoRow(final Composite pParent, String pProperty, IOOo pToSelect) {
- super(pParent, pProperty, pToSelect);
+ super(pParent, pProperty, Messages.getString("OOoRow.Browse"), pToSelect); //$NON-NLS-1$
}
/**
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 30c303d..9064702 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
@@ -68,7 +68,7 @@ public class SdkRow extends AbstractConfigRow {
* @param pToSelect the configuration element to select first
*/
public SdkRow(final Composite pParent, String pProperty, ISdk pToSelect) {
- super(pParent, pProperty, pToSelect);
+ super(pParent, pProperty, Messages.getString("SdkRow.Browse"), pToSelect); //$NON-NLS-1$
}
/**
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/TextRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/TextRow.java
index 9986b54..29cc6e8 100755
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/TextRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/TextRow.java
@@ -84,7 +84,7 @@ public class TextRow extends LabeledRow
aLabel.setText(pLabel);
Text aField = new Text(pParent, SWT.BORDER);
- createContent(pParent, aLabel, aField, null);
+ createContent(pParent, aLabel, aField, null, false);
mField.addFocusListener(this);
mField.addKeyListener(this);
}
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/TypeRow.java b/core/source/org/openoffice/ide/eclipse/core/gui/rows/TypeRow.java
index eb5692d..101dc4e 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/TypeRow.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/TypeRow.java
@@ -135,9 +135,9 @@ public class TypeRow extends TextRow {
* {@inheritDoc}
*/
protected void createContent(Composite pParent, Control pLabel,
- Control pField, String pBrowseText) {
-
- super.createContent(pParent, pLabel, pField, Messages.getString("TypeRow.Browse")); //$NON-NLS-1$
+ Control pField, String pBrowseText, boolean pLink) {
+
+ super.createContent(pParent, pLabel, pField, Messages.getString("TypeRow.Browse"), true); //$NON-NLS-1$
// Add a completion listener on the Text field
((Text)mField).addKeyListener(new KeyAdapter() {
@@ -200,7 +200,7 @@ public class TypeRow extends TextRow {
final Shell shell = pParent.getShell();
- mBrowse.addSelectionListener(new SelectionAdapter() {
+ addBrowseSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent pEvent) {
super.widgetSelected(pEvent);
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 5537359..5389f5f 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
@@ -1,10 +1,12 @@
FileRow.Browse=Browse
FileRow.DirectoryTitle=Select a directory
FileRow.FileTitle=Select a file
-TypeRow.Browse=Browse
+TypeRow.Browse=Show types...
DialogRow.BrowseLabel=Browse
+SdkRow.Browse=Configure SDK...
SdkRow.Label=SDK
SdkRow.DialogTitle=Configure SDKs
+OOoRow.Browse=Configure OpenOffice.org...
OOoRow.Label=OpenOffice.org
OOoRow.DialogTitle=Configure OOos
AbstractConfigRow.Label=configuration
diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/helpers/UnoidlProjectHelper.java b/core/source/org/openoffice/ide/eclipse/core/internal/helpers/UnoidlProjectHelper.java
index d1c912e..48f79e0 100644
--- a/core/source/org/openoffice/ide/eclipse/core/internal/helpers/UnoidlProjectHelper.java
+++ b/core/source/org/openoffice/ide/eclipse/core/internal/helpers/UnoidlProjectHelper.java
@@ -61,12 +61,12 @@ import org.openoffice.ide.eclipse.core.OOEclipsePlugin;
import org.openoffice.ide.eclipse.core.PluginLogger;
import org.openoffice.ide.eclipse.core.builders.TypesBuilder;
import org.openoffice.ide.eclipse.core.internal.model.UnoidlProject;
+import org.openoffice.ide.eclipse.core.model.CompositeFactory;
import org.openoffice.ide.eclipse.core.model.IUnoComposite;
import org.openoffice.ide.eclipse.core.model.IUnoFactoryConstants;
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.CompositeFactory;
import org.openoffice.ide.eclipse.core.model.SDKContainer;
import org.openoffice.ide.eclipse.core.model.UnoFactoryData;
import org.openoffice.ide.eclipse.core.model.UnoPackage;
@@ -189,7 +189,7 @@ public class UnoidlProjectHelper {
unoProject.setSourcesDir(sourcesDir);
// create the language-specific part
- language.getProjectHandler().configureProject(pData);
+ language.getProjectHandler().configureProject(pData, pMonitor);
// Save all the properties to the configuration file
@@ -373,10 +373,6 @@ public class UnoidlProjectHelper {
PluginLogger.debug(
"source folder created"); //$NON-NLS-1$
}
-
- pUnoproject.getLanguage().getProjectHandler().addLanguageDependencies(
- pUnoproject, pMonitor);
- PluginLogger.debug("Language dependencies added"); //$NON-NLS-1$
pUnoproject.getLanguage().getProjectHandler().addOOoDependencies(
pUnoproject.getOOo(), ((UnoidlProject)pUnoproject).getProject());
diff --git a/core/source/org/openoffice/ide/eclipse/core/model/language/IProjectHandler.java b/core/source/org/openoffice/ide/eclipse/core/model/language/IProjectHandler.java
index 4e160d6..35d8e24 100644
--- a/core/source/org/openoffice/ide/eclipse/core/model/language/IProjectHandler.java
+++ b/core/source/org/openoffice/ide/eclipse/core/model/language/IProjectHandler.java
@@ -44,7 +44,6 @@
package org.openoffice.ide.eclipse.core.model.language;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
@@ -64,10 +63,11 @@ public interface IProjectHandler {
* has to be contained in the provided data.
*
* @param pData the data describing the project to configure
+ * @param pMonitor the monitor reporting the progress
*
* @throws Exception if anything wrong happens.
*/
- public void configureProject(UnoFactoryData pData) throws Exception;
+ public void configureProject(UnoFactoryData pData, IProgressMonitor pMonitor) throws Exception;
/**
* Add a language specific language nature. This one has to
@@ -96,19 +96,6 @@ public interface IProjectHandler {
public void removeOOoDependencies(IOOo pOoo, IProject pProject);
/**
- * Adds the language specific dependencies for the project. This
- * is mostly about library path settings. This method although has
- * to add the build path to the libraries and the implementation as
- * the sources path.
- *
- * @param pUnoproject the UNO project on which to add the dependencies
- * @param pMonitor a progress monitor
- * @throws CoreException if there is any problem during the operation
- */
- public void addLanguageDependencies(IUnoidlProject pUnoproject,
- IProgressMonitor pMonitor) throws CoreException;
-
- /**
* Extracts the language option name to give to the
* <code>uno-skeletonmaker</code>: <code>--java5</code> for Java 1.5
* for example. To know the correct language name, please refer to
diff --git a/core/source/org/openoffice/ide/eclipse/core/preferences/MainPage.java b/core/source/org/openoffice/ide/eclipse/core/preferences/MainPage.java
index a8d5faa..e56aae9 100755
--- a/core/source/org/openoffice/ide/eclipse/core/preferences/MainPage.java
+++ b/core/source/org/openoffice/ide/eclipse/core/preferences/MainPage.java
@@ -83,7 +83,7 @@ public class MainPage extends PreferencePage implements IWorkbenchPreferencePage
body.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
mLoglevel = new ChoiceRow(body, LOGLEVEL,
- Messages.getString("MainPage.LogLevel"), null); //$NON-NLS-1$
+ Messages.getString("MainPage.LogLevel"), null, false); //$NON-NLS-1$
mLoglevel.add(Messages.getString("MainPage.Error"), //$NON-NLS-1$
LogLevels.ERROR.toString());
mLoglevel.add(Messages.getString("MainPage.Warning"), //$NON-NLS-1$
diff --git a/core/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeBrowser.java b/core/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeBrowser.java
index fe05f1f..ef64e21 100755
--- a/core/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeBrowser.java
+++ b/core/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeBrowser.java
@@ -211,7 +211,7 @@ public class UnoTypeBrowser extends StatusDialog
// create the types filter row
mTypeFilterRow = new ChoiceRow(body, F_TYPE_FILTER,
- Messages.getString("UnoTypeBrowser.FilterLabel"), null); //$NON-NLS-1$
+ Messages.getString("UnoTypeBrowser.FilterLabel"), null, false); //$NON-NLS-1$
mTypeFilterRow.setTooltip(Messages.getString("UnoTypeBrowser.FilterTooltip")); //$NON-NLS-1$
mTypeFilterRow.setFieldChangedListener(this);
setFilterValues();
diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/InterfaceMemberDialog.java b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/InterfaceMemberDialog.java
index 261dff6..a56c274 100644
--- a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/InterfaceMemberDialog.java
+++ b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/InterfaceMemberDialog.java
@@ -266,7 +266,7 @@ public class InterfaceMemberDialog extends TitleAreaDialog implements
typeComposite.setLayoutData(gd);
typeComposite.setLayout(new GridLayout(LabeledRow.LAYOUT_COLUMNS, false));
- mMemberTypeRow = new ChoiceRow(typeComposite, MEMBER_TYPE, null, null );
+ mMemberTypeRow = new ChoiceRow(typeComposite, MEMBER_TYPE, null, null, false );
mMemberTypeRow.add(
Messages.getString("InterfaceMemberDialog.MethodChoice"), "method"); //$NON-NLS-1$ //$NON-NLS-2$
mMemberTypeRow.add(
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 bd87064..f60ca9a 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
@@ -328,12 +328,15 @@ public class NewUnoProjectPage extends WizardNewProjectCreationPage
// Inherits the parents control
super.createControl(pParent);
+ initializeDialogUnits(pParent);
+
Composite control = (Composite)getControl();
// 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));
@@ -356,7 +359,7 @@ public class NewUnoProjectPage extends WizardNewProjectCreationPage
// Adding the programming language row
mLanguageRow = new ChoiceRow(body, LANGUAGE,
- Messages.getString("NewUnoProjectPage.Language"), null); //$NON-NLS-1$
+ Messages.getString("NewUnoProjectPage.Language"), null, false); //$NON-NLS-1$
mLanguageRow.setTooltip(Messages.getString("NewUnoProjectPage.LanguageTooltip")); //$NON-NLS-1$
// Sets the available programming languages
diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/PackageExportWizardPage.java b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/PackageExportWizardPage.java
index ea0db11..e75dbc6 100644
--- a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/PackageExportWizardPage.java
+++ b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/PackageExportWizardPage.java
@@ -155,7 +155,7 @@ public class PackageExportWizardPage extends WizardPage {
body.setLayout(new GridLayout(LabeledRow.LAYOUT_COLUMNS, false));
mProjectRow = new DialogRow(body, "", //$NON-NLS-1$
- Messages.getString("PackageExportWizardPage.PackageLabel")) { //$NON-NLS-1$
+ Messages.getString("PackageExportWizardPage.PackageLabel"), false) { //$NON-NLS-1$
@Override
public String doOpenDialog() {
String result = getValue();
@@ -208,7 +208,7 @@ public class PackageExportWizardPage extends WizardPage {
});
mOOoVersion = new ChoiceRow(body, OOVERSION,
- Messages.getString("PackageExportWizardPage.OOoVersionLabel"), null); //$NON-NLS-1$
+ Messages.getString("PackageExportWizardPage.OOoVersionLabel"), null, false); //$NON-NLS-1$
mOOoVersion.setTooltip(Messages.getString("PackageExportWizardPage.OOoVersionTooltip")); //$NON-NLS-1$
mOOoVersion.add("1.x", "zip"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java b/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java
index 07cc886..2011dc5 100644
--- a/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java
+++ b/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java
@@ -79,12 +79,6 @@ public class CppProjectHandler implements IProjectHandler {
"uno_cppuhelpergcc3", //$NON-NLS-1$
"uno_salhelpergcc3" //$NON-NLS-1$
};
-
- @Override
- public void addLanguageDependencies(IUnoidlProject pUnoproject,
- IProgressMonitor pMonitor) throws CoreException {
- // Everything is done in the configureProject method
- }
@Override
public void addOOoDependencies(IOOo pOoo, IProject pProject) {
@@ -106,7 +100,7 @@ public class CppProjectHandler implements IProjectHandler {
* {@inheritDoc}
*/
@Override
- public void configureProject(UnoFactoryData pData) throws Exception {
+ public void configureProject(UnoFactoryData pData, IProgressMonitor pMonitor) throws Exception {
IProject prj = (IProject)pData.getProperty(
IUnoFactoryConstants.PROJECT_HANDLE);
diff --git a/java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java b/java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java
index 8b34526..fdcf6a9 100644
--- a/java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java
+++ b/java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java
@@ -87,31 +87,6 @@ public class JavaProjectHandler implements IProjectHandler {
"unoloader.jar", //$NON-NLS-1$
"officebean.jar" //$NON-NLS-1$
};
-
- /**
- * {@inheritDoc}
- */
- public void addLanguageDependencies(IUnoidlProject pUnoproject,
- IProgressMonitor pMonitor) throws CoreException {
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- pUnoproject.getName());
-
- IJavaProject javaProject = JavaCore.create(project);
- javaProject.open(pMonitor);
-
- IPath sourcePath = pUnoproject.getFolder(pUnoproject.getSourcePath()).getFullPath();
- IPath buildPath = pUnoproject.getFolder(pUnoproject.getBuildPath()).getFullPath();
-
- IClasspathEntry[] entries = new IClasspathEntry[] {
- JavaCore.newSourceEntry(sourcePath),
- JavaRuntime.getDefaultJREContainerEntry(),
- JavaCore.newLibraryEntry(buildPath, null, null, false)
- };
-
- javaProject.setRawClasspath(entries, pMonitor);
-
- }
/**
* {@inheritDoc}
@@ -159,7 +134,7 @@ public class JavaProjectHandler implements IProjectHandler {
/**
* {@inheritDoc}
*/
- public void configureProject(UnoFactoryData pData) throws Exception {
+ public void configureProject(UnoFactoryData pData, IProgressMonitor pMonitor) throws Exception {
// Get the project from data
IProject prj = (IProject)pData.getProperty(
@@ -177,6 +152,24 @@ public class JavaProjectHandler implements IProjectHandler {
JavaWizardPage.JAVA_VERSION);
unoprj.setProperty(P_JAVA_VERSION, javaversion);
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
+ unoprj.getName());
+
+ // Create the project structure
+ IJavaProject javaProject = JavaCore.create(project);
+ javaProject.open( pMonitor );
+
+ IPath sourcePath = unoprj.getFolder(unoprj.getSourcePath()).getFullPath();
+ IPath buildPath = unoprj.getFolder(unoprj.getBuildPath()).getFullPath();
+
+ IClasspathEntry[] entries = new IClasspathEntry[] {
+ JavaCore.newSourceEntry(sourcePath),
+ JavaRuntime.getDefaultJREContainerEntry(),
+ JavaCore.newLibraryEntry(buildPath, null, null, false)
+ };
+
+ javaProject.setRawClasspath(entries, pMonitor);
+
// Add the registration files
RegistrationHelper.generateFiles( unoprj );
diff --git a/java/source/org/openoffice/ide/eclipse/java/JavaWizardPage.java b/java/source/org/openoffice/ide/eclipse/java/JavaWizardPage.java
index fbc4dd9..313c334 100644
--- a/java/source/org/openoffice/ide/eclipse/java/JavaWizardPage.java
+++ b/java/source/org/openoffice/ide/eclipse/java/JavaWizardPage.java
@@ -119,7 +119,7 @@ public class JavaWizardPage extends LanguageWizardPage {
// Create the Java version row
mJavaVersionRow = new ChoiceRow(body, JAVA_VERSION,
- Messages.getString("JavaWizardPage.JavaVersion"), null); //$NON-NLS-1$
+ Messages.getString("JavaWizardPage.JavaVersion"), null, false); //$NON-NLS-1$
mJavaVersionRow.add(Messages.getString("JavaWizardPage.Java4"), "java4"); //$NON-NLS-1$ //$NON-NLS-2$
mJavaVersionRow.add(Messages.getString("JavaWizardPage.Java5"), "java5"); //$NON-NLS-1$ //$NON-NLS-2$
mJavaVersionRow.setFieldChangedListener( new IFieldChangedListener() {
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
new file mode 100644
index 0000000..8a8be93
--- /dev/null
+++ b/java/source/org/openoffice/ide/eclipse/java/client/AUTHORS.txt.tpl
@@ -0,0 +1,6 @@
+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/ClientWizard.java b/java/source/org/openoffice/ide/eclipse/java/client/ClientWizard.java
index 5cc7e36..f2bbc04 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/ClientWizard.java
+++ b/java/source/org/openoffice/ide/eclipse/java/client/ClientWizard.java
@@ -30,11 +30,9 @@
************************************************************************/
package org.openoffice.ide.eclipse.java.client;
-import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IFile;
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.IPath;
@@ -127,8 +125,8 @@ public class ClientWizard extends BasicNewResourceWizard {
IPath srcPath = srcFolder.getProjectRelativePath();
String path = srcPath.append( DEST_PACKAGE.replace( '.', '/' ) ).toString();
- TemplatesHelper.copyTemplate( prj, CLIENT_CLASS, ClientWizard.class,
- path, DEST_PACKAGE, mCnxPage.getConnectionCode() );
+ 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 );
@@ -159,10 +157,10 @@ public class ClientWizard extends BasicNewResourceWizard {
@Override
public void addPages() {
- mFirstPage = new NewJavaProjectWizardPageOne();
+ mCnxPage = new UnoConnectionPage();
+ mFirstPage = new ClientWizardPageOne( mCnxPage );
addPage( mFirstPage );
- mCnxPage = new UnoConnectionPage();
addPage( mCnxPage );
mThirdPage = new NewJavaProjectWizardPageTwo( mFirstPage );
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/ClientWizardPageOne.java b/java/source/org/openoffice/ide/eclipse/java/client/ClientWizardPageOne.java
new file mode 100644
index 0000000..aa54169
--- /dev/null
+++ b/java/source/org/openoffice/ide/eclipse/java/client/ClientWizardPageOne.java
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * 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.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.ui.wizards.NewJavaProjectWizardPageOne;
+import org.openoffice.ide.eclipse.core.model.config.IOOo;
+import org.openoffice.ide.eclipse.java.build.OOoClasspathContainer;
+
+/**
+ * The first page of the UNO Java client wizard overrides the default
+ * New Java project first page to add the OOo libraries as default dependencies.
+ *
+ * <p><strong>Many thanks to Karl Weber for pointing that and providing
+ * sample code.</strong></p>
+ *
+ * @author cbosdonnat
+ *
+ */
+public class ClientWizardPageOne extends NewJavaProjectWizardPageOne {
+
+ private UnoConnectionPage mCnxPage;
+
+ /**
+ * Constructor.
+ *
+ * @param pCnxPage the connection page of the wizard
+ */
+ public ClientWizardPageOne( UnoConnectionPage pCnxPage ) {
+ super();
+ mCnxPage = pCnxPage;
+ }
+
+ @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;
+
+ 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
index 25ad719..df6903b 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/CnxProjectHelper.java
+++ b/java/source/org/openoffice/ide/eclipse/java/client/CnxProjectHelper.java
@@ -1,3 +1,33 @@
+/*************************************************************************
+ *
+ * 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;
@@ -9,11 +39,11 @@ 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.Path;
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;
@@ -29,6 +59,8 @@ 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$
@@ -41,8 +73,6 @@ public class CnxProjectHelper {
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$
-
- private static final String JRE_ID = "org.eclipse.jdt.launching.JRE_CONTAINER"; //$NON-NLS-1$
/**
@@ -91,7 +121,7 @@ public class CnxProjectHelper {
if ( creating ) {
cnxPrj = JavaCore.create( prj );
IClasspathEntry srcEntry = JavaCore.newSourceEntry( src.getFullPath() );
- IClasspathEntry jreEntry = JavaCore.newContainerEntry( new Path( JRE_ID ) );
+ IClasspathEntry jreEntry = JavaRuntime.getDefaultJREContainerEntry();
cnxPrj.setRawClasspath( new IClasspathEntry[] { srcEntry, jreEntry }, pMonitor );
cnxPrj.setOutputLocation( bin.getFullPath(), pMonitor );
cnxPrj.save( pMonitor, true );
@@ -105,8 +135,15 @@ public class CnxProjectHelper {
// Add the sources
String path = src.getProjectRelativePath().append( DEST_PACKAGE.replace( '.', '/' ) ).toString();
for ( String helperClass : HELPER_CLASSES ) {
- TemplatesHelper.copyTemplate( prj, helperClass, ClientWizard.class, path, DEST_PACKAGE );
+ 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 );
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
new file mode 100644
index 0000000..1837b0a
--- /dev/null
+++ b/java/source/org/openoffice/ide/eclipse/java/client/LICENSE.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/registration/RegistrationHelper.java b/java/source/org/openoffice/ide/eclipse/java/registration/RegistrationHelper.java
index 34e67b1..8ad9c3d 100644
--- a/java/source/org/openoffice/ide/eclipse/java/registration/RegistrationHelper.java
+++ b/java/source/org/openoffice/ide/eclipse/java/registration/RegistrationHelper.java
@@ -79,7 +79,8 @@ public abstract class RegistrationHelper {
public static void generateFiles(IUnoidlProject pProject) {
// Copy the RegistrationHandler.java.tpl file
- TemplatesHelper.copyTemplate( pProject, CLASS_FILENAME, RegistrationHelper.class, new String( ) );
+ TemplatesHelper.copyTemplate( pProject, CLASS_FILENAME + TemplatesHelper.JAVA_EXT,
+ RegistrationHelper.class, new String( ) );
// Create the empty RegistrationHandler.classes file
ByteArrayInputStream empty = new ByteArrayInputStream(new byte[0]);
diff --git a/java/source/org/openoffice/ide/eclipse/java/tests/TestsHelper.java b/java/source/org/openoffice/ide/eclipse/java/tests/TestsHelper.java
index cb1c9b9..4827b7c 100644
--- a/java/source/org/openoffice/ide/eclipse/java/tests/TestsHelper.java
+++ b/java/source/org/openoffice/ide/eclipse/java/tests/TestsHelper.java
@@ -31,11 +31,11 @@
package org.openoffice.ide.eclipse.java.tests;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.buildpath.JUnitContainerInitializer;
import org.openoffice.ide.eclipse.core.PluginLogger;
import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
import org.openoffice.ide.eclipse.java.utils.TemplatesHelper;
@@ -57,6 +57,11 @@ public class TestsHelper {
};
private static final String TEST_PATH = "tests"; //$NON-NLS-1$
+
+ private static final String JUNIT_CONTAINER = "org.eclipse.jdt.junit.JUNIT_CONTAINER"; //$NON-NLS-1$
+ private static final String JUNIT3 = "3"; //$NON-NLS-1$
+ private static final IPath JUNIT3_PATH = new Path( JUNIT_CONTAINER ).append( JUNIT3 );
+
/**
* Creates all the test classes files in the UNO project.
*
@@ -64,7 +69,8 @@ public class TestsHelper {
*/
public static void writeTestClasses( IUnoidlProject pProject ) {
for (String template : TEMPLATES) {
- TemplatesHelper.copyTemplate( pProject, template, TestsHelper.class, TEST_PATH );
+ TemplatesHelper.copyTemplate( pProject, template + TemplatesHelper.JAVA_EXT,
+ TestsHelper.class, TEST_PATH );
}
}
@@ -73,7 +79,6 @@ public class TestsHelper {
*
* @param pProject the project to add the libraries on
*/
- @SuppressWarnings("restriction")
public static void addJUnitLibraries( IJavaProject pProject ) {
try {
IClasspathEntry[] oldEntries = pProject.getRawClasspath();
@@ -81,8 +86,7 @@ public class TestsHelper {
System.arraycopy(oldEntries, 0, entries, 0, oldEntries.length);
- IPath path = JUnitContainerInitializer.JUNIT3_PATH;
- IClasspathEntry containerEntry = JavaCore.newContainerEntry(path);
+ IClasspathEntry containerEntry = JavaCore.newContainerEntry(JUNIT3_PATH);
entries[entries.length - 1] = containerEntry;
pProject.setRawClasspath(entries, null);
diff --git a/java/source/org/openoffice/ide/eclipse/java/utils/TemplatesHelper.java b/java/source/org/openoffice/ide/eclipse/java/utils/TemplatesHelper.java
index f9f3d28..3160ec2 100644
--- a/java/source/org/openoffice/ide/eclipse/java/utils/TemplatesHelper.java
+++ b/java/source/org/openoffice/ide/eclipse/java/utils/TemplatesHelper.java
@@ -38,11 +38,13 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.MessageFormat;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.openoffice.ide.eclipse.core.PluginLogger;
import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
@@ -64,8 +66,8 @@ import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
public class TemplatesHelper {
- private static final String JAVA_EXT = ".java"; //$NON-NLS-1$
- private static final String TEMPLATE_EXT = JAVA_EXT + ".tpl"; //$NON-NLS-1$
+ public static final String JAVA_EXT = ".java"; //$NON-NLS-1$
+ private static final String TEMPLATE_EXT = ".tpl"; //$NON-NLS-1$
/**
* Copies the template to the UNO project.
@@ -113,8 +115,11 @@ public class TemplatesHelper {
String fileName = pTemplateName + TEMPLATE_EXT;
// Get the path where to place the files
- IFolder dest = pProject.getFolder( pDestPath );
- dest.getProjectRelativePath().toFile().mkdirs();
+ IContainer dest = pProject;
+ if ( pDestPath != null && !pDestPath.equals( new String( ) ) ) {
+ dest = pProject.getFolder( pDestPath );
+ dest.getLocation().toFile().mkdirs();
+ }
// Read the template into a buffer
FileWriter writer = null;
@@ -123,7 +128,7 @@ public class TemplatesHelper {
InputStream in = null;
try {
// Destination file opening
- IFile classIFile = dest.getFile( pTemplateName + JAVA_EXT );
+ IFile classIFile = dest.getFile( new Path( pTemplateName ) );
File classFile = classIFile.getLocation().toFile();
if (!classFile.exists()) {
More information about the ooo-build-commit
mailing list