[ooo-build-commit] ooeclipse: Branch 'master' - 2 commits
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Sat Oct 3 01:43:39 PDT 2009
core/META-INF/MANIFEST.MF | 2
core/build/MANIFEST.MF.in | 27 +++++++---
core/source/org/openoffice/ide/eclipse/core/gui/TypeCellEditor.java | 2
core/source/org/openoffice/ide/eclipse/core/gui/rows/ChoiceRow.java | 2
core/source/org/openoffice/ide/eclipse/core/internal/helpers/UnoidlProjectHelper.java | 6 +-
cpp/META-INF/MANIFEST.MF | 2
cpp/build/MANIFEST.MF.in | 2
java/.settings/org.eclipse.jdt.core.prefs | 7 ++
java/build/MANIFEST.MF.in | 11 ++--
9 files changed, 42 insertions(+), 19 deletions(-)
New commits:
commit 4e23902517070085c15b8524250fcc160eb3a15b
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Sat Oct 3 10:43:43 2009 +0200
Fixed misc bugs:
* Interface method arguments where written using . instead of ::
* The ChoiceRow spans wheren't correct
* Crash during the UNO-IDL project creation
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/TypeCellEditor.java b/core/source/org/openoffice/ide/eclipse/core/gui/TypeCellEditor.java
index 62df5fd..28bda40 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/TypeCellEditor.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/TypeCellEditor.java
@@ -154,7 +154,7 @@ public class TypeCellEditor extends TextCellEditor {
InternalUnoType mSelectedType = browser.getSelectedType();
if (null != mSelectedType) {
int pos = text.getCaretPosition();
- text.insert(mSelectedType.getFullName());
+ text.insert(mSelectedType.getFullName().replaceAll("\\.", "::")); //$NON-NLS-1$ //$NON-NLS-2$
text.setFocus();
text.setSelection(pos + mSelectedType.getFullName().length());
result = text.getText().trim();
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 abea4b9..8d0a9d7 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
@@ -121,7 +121,7 @@ public class ChoiceRow extends LabeledRow {
}
GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = ((GridLayout)pParent.getLayout()).numColumns - numFields;
+ gd.horizontalSpan = ((GridLayout)pParent.getLayout()).numColumns - numFields + 1;
aField.setLayoutData(gd);
}
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 a33ba12..d1c912e 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
@@ -160,9 +160,6 @@ public class UnoidlProjectHelper {
ILanguage language = (ILanguage)pData.getProperty(
IUnoFactoryConstants.PROJECT_LANGUAGE);
unoProject.setLanguage(language);
-
- // create the language-specific part
- language.getProjectHandler().configureProject(pData);
// Set the SDK
String sdkname = (String)pData.getProperty(
@@ -191,6 +188,9 @@ public class UnoidlProjectHelper {
}
unoProject.setSourcesDir(sourcesDir);
+ // create the language-specific part
+ language.getProjectHandler().configureProject(pData);
+
// Save all the properties to the configuration file
unoProject.saveAllProperties();
commit 84cdd69bf58f9d4a0e57a31335559fa9bc12188d
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Sat Oct 3 10:17:15 2009 +0200
Updated projects configs
diff --git a/core/META-INF/MANIFEST.MF b/core/META-INF/MANIFEST.MF
index 7e8aeb2..2573fa3 100755
--- a/core/META-INF/MANIFEST.MF
+++ b/core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.openoffice.ide.eclipse.core; singleton:=true
-Bundle-Version: 1.1.0
+Bundle-Version: 1.2.0
Bundle-Activator: org.openoffice.ide.eclipse.core.OOEclipsePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
diff --git a/core/build/MANIFEST.MF.in b/core/build/MANIFEST.MF.in
index 261715e..6e877a0 100755
--- a/core/build/MANIFEST.MF.in
+++ b/core/build/MANIFEST.MF.in
@@ -1,12 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: OOo eclipse integration
+Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.openoffice.ide.eclipse.core; singleton:=true
Bundle-Version: @VERSION@
Bundle-Activator: org.openoffice.ide.eclipse.core.OOEclipsePlugin
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface.text,
org.eclipse.core.resources,
org.eclipse.ui.editors,
@@ -18,15 +17,31 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.forms,
org.junit,
org.eclipse.debug.core,
- org.eclipse.debug.ui
-Eclipse-LazyStart: true
+ org.eclipse.debug.ui,
+ org.eclipse.ui,
+ javax.xml
+Bundle-ActivationPolicy: lazy
Export-Package: org.openoffice.ide.eclipse.core,
+ org.openoffice.ide.eclipse.core.actions,
+ org.openoffice.ide.eclipse.core.builders,
+ org.openoffice.ide.eclipse.core.editors,
+ org.openoffice.ide.eclipse.core.editors.main,
+ org.openoffice.ide.eclipse.core.editors.syntax,
+ org.openoffice.ide.eclipse.core.gui,
org.openoffice.ide.eclipse.core.gui.rows,
org.openoffice.ide.eclipse.core.i18n,
org.openoffice.ide.eclipse.core.launch,
org.openoffice.ide.eclipse.core.model,
+ org.openoffice.ide.eclipse.core.model.config,
+ org.openoffice.ide.eclipse.core.model.description,
org.openoffice.ide.eclipse.core.model.language,
+ org.openoffice.ide.eclipse.core.office,
org.openoffice.ide.eclipse.core.preferences,
+ org.openoffice.ide.eclipse.core.unittests,
+ org.openoffice.ide.eclipse.core.unotypebrowser,
org.openoffice.ide.eclipse.core.utils,
- org.openoffice.ide.eclipse.core.wizards
+ org.openoffice.ide.eclipse.core.wizards,
+ org.openoffice.ide.eclipse.core.wizards.pages,
+ org.openoffice.ide.eclipse.core.wizards.utils
Bundle-Vendor: OpenOffice.org
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/cpp/META-INF/MANIFEST.MF b/cpp/META-INF/MANIFEST.MF
index e9292dd..f038538 100644
--- a/cpp/META-INF/MANIFEST.MF
+++ b/cpp/META-INF/MANIFEST.MF
@@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.cdt.ui;bundle-version="5.1.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
org.eclipse.ui.cheatsheets
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/cpp/build/MANIFEST.MF.in b/cpp/build/MANIFEST.MF.in
index f155010..f30c0b3 100644
--- a/cpp/build/MANIFEST.MF.in
+++ b/cpp/build/MANIFEST.MF.in
@@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.cdt.ui,
org.eclipse.ui.ide,
org.eclipse.ui.cheatsheets
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/java/.settings/org.eclipse.jdt.core.prefs b/java/.settings/org.eclipse.jdt.core.prefs
index 17bb986..daa29bc 100644
--- a/java/.settings/org.eclipse.jdt.core.prefs
+++ b/java/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
-#Mon Jul 27 15:39:49 CEST 2009
+#Sat Oct 03 10:15:46 CEST 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
diff --git a/java/build/MANIFEST.MF.in b/java/build/MANIFEST.MF.in
index 9dfeed6..4de34bf 100644
--- a/java/build/MANIFEST.MF.in
+++ b/java/build/MANIFEST.MF.in
@@ -4,8 +4,7 @@ Bundle-Name: Java Plug-in for OOo eclipse integration
Bundle-SymbolicName: org.openoffice.ide.eclipse.java; singleton:=true
Bundle-Version: @VERSION@
Bundle-Activator: org.openoffice.ide.eclipse.java.OOoJavaPlugin
-Bundle-Vendor: Cédric Bosdonnat
-Bundle-Localization: plugin
+Bundle-Vendor: OpenOffice.org
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.openoffice.ide.eclipse.core,
@@ -14,5 +13,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jdt.launching,
org.eclipse.jdt,
org.eclipse.jdt.ui,
- org.eclipse.jface.text
-Eclipse-LazyStart: true
+ org.eclipse.jface.text,
+ org.eclipse.jdt.junit;bundle-version="3.5.0",
+ org.eclipse.ui.ide,
+ org.eclipse.ui.cheatsheets
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
More information about the ooo-build-commit
mailing list