diff options
author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2009-10-05 09:40:03 +0200 |
---|---|---|
committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2009-10-05 09:40:03 +0200 |
commit | 22ee7620d7241c7ff516ad557f6449e1e2337c0c (patch) | |
tree | e5b6ed577249c960a3e0ae330a89ee579ee22a80 | |
parent | 386cd7667cb24ba512ecbd43f445e4f871494b74 (diff) |
Really fixed the move of regmerge out of the SDKooeclipse-1-1-2
6 files changed, 54 insertions, 18 deletions
diff --git a/core/.project b/core/.project index c418fd9..099bc94 100755 --- a/core/.project +++ b/core/.project @@ -21,7 +21,7 @@ </arguments> </buildCommand> <buildCommand> - <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> <arguments> </arguments> </buildCommand> @@ -29,6 +29,6 @@ <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> </projectDescription> diff --git a/core/source/org/openoffice/ide/eclipse/core/builders/RegmergeBuilder.java b/core/source/org/openoffice/ide/eclipse/core/builders/RegmergeBuilder.java index ee5090a..e68799b 100755 --- a/core/source/org/openoffice/ide/eclipse/core/builders/RegmergeBuilder.java +++ b/core/source/org/openoffice/ide/eclipse/core/builders/RegmergeBuilder.java @@ -124,7 +124,7 @@ public class RegmergeBuilder { existingReg + "\"" + pFile.getAbsolutePath() + "\""; //$NON-NLS-1$ //$NON-NLS-2$ // Process creation. Need to set the PATH value using OOo path: due to some tools changes in 3.1 - String[] sPaths = pUnoprj.getOOo().getLibsPath(); + String[] sPaths = pUnoprj.getOOo().getBinPath(); String sPathValue = "PATH="; //$NON-NLS-1$ for (String sPath : sPaths) { if ( !sPathValue.endsWith("=")) { //$NON-NLS-1$ diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/model/OOo.java b/core/source/org/openoffice/ide/eclipse/core/internal/model/OOo.java index cb1067f..49b733d 100644 --- a/core/source/org/openoffice/ide/eclipse/core/internal/model/OOo.java +++ b/core/source/org/openoffice/ide/eclipse/core/internal/model/OOo.java @@ -167,6 +167,21 @@ public class OOo extends AbstractOOo { /** * {@inheritDoc} */ + public String[] getBinPath() { + // Nothing if not OOo3 + String[] otherPaths = mMapper.getAdditionnalBins(); + + String bins = getHome() + FILE_SEP + "program"; //$NON-NLS-1$ + if (Platform.getOS().equals(Platform.OS_MACOSX)) { + bins = getHome() + FILE_SEP + "MacOS"; //$NON-NLS-1$ + } + + return mMapper.mergeArrays(new String[]{ bins }, otherPaths); + } + + /** + * {@inheritDoc} + */ public String[] getTypesPath() { String[] paths = { getLibsPath()[0] + FILE_SEP + "types.rdb" //$NON-NLS-1$ @@ -511,7 +526,7 @@ public class OOo extends AbstractOOo { public OOo3PathMapper(String pHome) { mHome = pHome; } - + /** * @return <code>true</code> if the openoffice install corresponds to a 3.0 * installation layout, <code>false</code> otherwise. @@ -563,6 +578,23 @@ public class OOo extends AbstractOOo { } /** + * @return the binaries path to add for OOo3 or an empty array if not an + * OOo3 install. + */ + public String[] getAdditionnalBins() { + String[] additionnal = new String[0]; + + if (isVersion3()) { + String[] ureBins = mUre.getBinPath(); + String basisBins = mBasis + FILE_SEP + "program"; //$NON-NLS-1$ + + additionnal = mergeArrays(ureBins, new String[]{basisBins}); + } + + return additionnal; + } + + /** * @return the OOo 3.0 classes path or an empty array if not an OOo3 install. */ public String[] getClasses() { @@ -627,18 +659,6 @@ public class OOo extends AbstractOOo { } /** - * @return the javaldx path for OOo3 or <code>null</code> if not an OOo3 install. - */ - public String getJavaldx() { - String path = null; - if (isVersion3()) { - path = mUre.getJavaldxPath(); - } - - return path; - } - - /** * Merge two string arrays into one. * * The duplicated elements are not removed. diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/model/URE.java b/core/source/org/openoffice/ide/eclipse/core/internal/model/URE.java index edfabe4..3941138 100644 --- a/core/source/org/openoffice/ide/eclipse/core/internal/model/URE.java +++ b/core/source/org/openoffice/ide/eclipse/core/internal/model/URE.java @@ -116,6 +116,14 @@ public class URE extends AbstractOOo { } return new String[]{ libs }; } + + /** + * {@inheritDoc} + */ + public String[] getBinPath() { + String libs = getHome() + FILE_SEP + "bin"; //$NON-NLS-1$ + return new String[]{ libs }; + } /** * {@inheritDoc} diff --git a/core/source/org/openoffice/ide/eclipse/core/preferences/IOOo.java b/core/source/org/openoffice/ide/eclipse/core/preferences/IOOo.java index 010abea..8261e8e 100644 --- a/core/source/org/openoffice/ide/eclipse/core/preferences/IOOo.java +++ b/core/source/org/openoffice/ide/eclipse/core/preferences/IOOo.java @@ -103,6 +103,14 @@ public interface IOOo { public String[] getLibsPath(); /** + * <p>Returns the path to any folder containing binaries in the OOo installation. + * This string could be passed to the Path constructor to get the folder object.</p> + * + * @return paths to the OpenOffice.org binary directories + */ + public String[] getBinPath(); + + /** * @return the path to the <code>types.rdb</code> file of the OOo or URE * instance. */ diff --git a/java/.project b/java/.project index fbc8b53..5aaee2f 100644 --- a/java/.project +++ b/java/.project @@ -21,7 +21,7 @@ </arguments> </buildCommand> <buildCommand> - <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> <arguments> </arguments> </buildCommand> @@ -29,6 +29,6 @@ <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> </projectDescription> |