summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2009-09-05 19:31:54 +0200
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2009-09-05 19:31:54 +0200
commit1863fd7c53f1d5608f70fb316f57ed03c99bcfe8 (patch)
tree6d86585712e07d29d2371358d6c376b626613e50 /java
parent1eebdfb4b8202a6e63da6185a88a32df673dbd72 (diff)
C++ support enhancements & Core cleanup
Switched the created C++ project to a managed build one. The libraries and includes are now set. Moved the ISdk, IOOo and al classes to a more obvious package. Moved the call of configureProject() as the first method called in the language configuration.
Diffstat (limited to 'java')
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/JavaBuilder.java4
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java2
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/build/OOoClasspathContainer.java2
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java2
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/build/OooClasspathContainerInitializer.java2
5 files changed, 6 insertions, 6 deletions
diff --git a/java/source/org/openoffice/ide/eclipse/java/JavaBuilder.java b/java/source/org/openoffice/ide/eclipse/java/JavaBuilder.java
index 6227d47..e6692d2 100644
--- a/java/source/org/openoffice/ide/eclipse/java/JavaBuilder.java
+++ b/java/source/org/openoffice/ide/eclipse/java/JavaBuilder.java
@@ -70,9 +70,9 @@ import org.openoffice.ide.eclipse.core.PluginLogger;
import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
import org.openoffice.ide.eclipse.core.model.ProjectsManager;
import org.openoffice.ide.eclipse.core.model.UnoPackage;
+import org.openoffice.ide.eclipse.core.model.config.IOOo;
+import org.openoffice.ide.eclipse.core.model.config.ISdk;
import org.openoffice.ide.eclipse.core.model.language.ILanguageBuilder;
-import org.openoffice.ide.eclipse.core.preferences.IOOo;
-import org.openoffice.ide.eclipse.core.preferences.ISdk;
import org.openoffice.ide.eclipse.core.utils.ZipContent;
import org.openoffice.ide.eclipse.java.utils.ZipContentHelper;
diff --git a/java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java b/java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java
index a464439..8b34526 100644
--- a/java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java
+++ b/java/source/org/openoffice/ide/eclipse/java/JavaProjectHandler.java
@@ -62,8 +62,8 @@ import org.openoffice.ide.eclipse.core.model.IUnoFactoryConstants;
import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
import org.openoffice.ide.eclipse.core.model.ProjectsManager;
import org.openoffice.ide.eclipse.core.model.UnoFactoryData;
+import org.openoffice.ide.eclipse.core.model.config.IOOo;
import org.openoffice.ide.eclipse.core.model.language.IProjectHandler;
-import org.openoffice.ide.eclipse.core.preferences.IOOo;
import org.openoffice.ide.eclipse.java.build.OOoContainerPage;
import org.openoffice.ide.eclipse.java.registration.RegistrationHelper;
import org.openoffice.ide.eclipse.java.tests.TestsHelper;
diff --git a/java/source/org/openoffice/ide/eclipse/java/build/OOoClasspathContainer.java b/java/source/org/openoffice/ide/eclipse/java/build/OOoClasspathContainer.java
index 09e629a..03a7454 100644
--- a/java/source/org/openoffice/ide/eclipse/java/build/OOoClasspathContainer.java
+++ b/java/source/org/openoffice/ide/eclipse/java/build/OOoClasspathContainer.java
@@ -51,7 +51,7 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.JavaCore;
-import org.openoffice.ide.eclipse.core.preferences.IOOo;
+import org.openoffice.ide.eclipse.core.model.config.IOOo;
import org.openoffice.ide.eclipse.java.JavaProjectHandler;
/**
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 c3924cb..1278107 100644
--- a/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
+++ b/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
@@ -63,7 +63,7 @@ import org.openoffice.ide.eclipse.core.gui.rows.OOoRow;
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.preferences.IOOo;
+import org.openoffice.ide.eclipse.core.model.config.IOOo;
import org.openoffice.ide.eclipse.java.Messages;
import org.openoffice.ide.eclipse.java.OOoJavaPlugin;
diff --git a/java/source/org/openoffice/ide/eclipse/java/build/OooClasspathContainerInitializer.java b/java/source/org/openoffice/ide/eclipse/java/build/OooClasspathContainerInitializer.java
index c852cf6..2d388cc 100644
--- a/java/source/org/openoffice/ide/eclipse/java/build/OooClasspathContainerInitializer.java
+++ b/java/source/org/openoffice/ide/eclipse/java/build/OooClasspathContainerInitializer.java
@@ -50,7 +50,7 @@ import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.openoffice.ide.eclipse.core.model.OOoContainer;
-import org.openoffice.ide.eclipse.core.preferences.IOOo;
+import org.openoffice.ide.eclipse.core.model.config.IOOo;
/**
* Initializes a classpath container for OOo instances.