Author: cmarcum
Date: Sat Sep 21 18:06:48 2013
New Revision: 1525271
URL: http://svn.apache.org/r1525271
Log:
#i123266#
updated Netbeans plugin for 3-layer removal
ProjectCreator.java:
removed last change of adding ! to isThreeLayerOffice
removed platform from sdkBinPath
update ureBinPath
IxLocator.java
updated mUreBinPath to <OfficePath>/program
Modified:
openoffice/devtools/netbeansintegration/trunk/manifest.mf
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/IxLocator.java
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/ProjectCreator.java
Modified: openoffice/devtools/netbeansintegration/trunk/manifest.mf
URL:
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/manifest.mf?rev=1525271&r1=1525270&r2=1525271&view=diff
==============================================================================
--- openoffice/devtools/netbeansintegration/trunk/manifest.mf (original)
+++ openoffice/devtools/netbeansintegration/trunk/manifest.mf Sat Sep 21
18:06:48 2013
@@ -4,7 +4,7 @@ OpenIDE-Module-Layer: org/openoffice/ext
OpenIDE-Module-Localizing-Bundle: org/openoffice/extensions/Bundle.properties
OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help
OpenIDE-Module-Install: org/openoffice/extensions/config/OOoModuleInstall.class
-OpenIDE-Module-Specification-Version: 4.0.3
+OpenIDE-Module-Specification-Version: 4.0.4
Name: org/openoffice/extensions/filetypes/odf/OdfDataLoader.class
OpenIDE-Module-Class: Loader
Modified:
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/IxLocator.java
URL:
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/IxLocator.java?rev=1525271&r1=1525270&r2=1525271&view=diff
==============================================================================
---
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/IxLocator.java
(original)
+++
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/IxLocator.java
Sat Sep 21 18:06:48 2013
@@ -72,11 +72,10 @@ public class IxLocator extends PlatformL
try {
String path = mOfficePath.getCanonicalPath();
mJuhJurtRidlPath = path.concat("/program/classes"); // NOI18N
- mUreBinPath = mSdkPath.getCanonicalPath().concat("/").concat(
- PlatformInfo.getPlatformBinDir()).concat("/bin");
+ mUreBinPath = path.concat("/program"); // ex. where remerge is
// add "/usr/lib" to path
+ // no need to also add mUreBinPath because it duplicated
/program
mPathVariable = path.concat("/program").concat(":").concat(
- mUreBinPath).concat(
":/usr/bin"); // // NOI18N
mJutUnoilPath = mJuhJurtRidlPath;
mTypesPath = new String[]{path.concat("/program/types.rdb")};
// NOI18N
Modified:
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/ProjectCreator.java
URL:
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/ProjectCreator.java?rev=1525271&r1=1525270&r2=1525271&view=diff
==============================================================================
---
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/ProjectCreator.java
(original)
+++
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/ProjectCreator.java
Sat Sep 21 18:06:48 2013
@@ -425,9 +425,9 @@ public class ProjectCreator {
private void skeletonmaker(AddOn addon) {
String platform = PlatformInfo.getPlatformBinDir();
String sdkPath = (String)wiz.getProperty("SdkPath"); // NOI18N
- String sdkBinPath =
sdkPath.concat(File.separator).concat(platform).concat(File.separator).concat("bin");
// NOI18N
+ String sdkBinPath = sdkPath.concat(File.separator).concat("bin"); //
NOI18N
// np exception? should not happen this far in the code
- if (!OpenOfficeLocation.getOpenOfficeLocation().isThreeLayerOffice()) {
+ if (OpenOfficeLocation.getOpenOfficeLocation().isThreeLayerOffice()) {
sdkBinPath = sdkPath.concat(File.separator).concat("bin"); //
NOI18N
}
String soPath = "";
@@ -511,8 +511,8 @@ public class ProjectCreator {
String projDir =
((File)wiz.getProperty("projdir")).getCanonicalPath(); // NOI18N
String platform = PlatformInfo.getPlatformBinDir();
String sdkPath = (String)wiz.getProperty("SdkPath"); // NOI18N
- String sdkBinPath =
sdkPath.concat(File.separator).concat(platform).concat(File.separator).concat("bin");
// NOI18N
- String ureBinPath = sdkBinPath;
+ String sdkBinPath = sdkPath.concat(File.separator).concat("bin"); //
NOI18N
+ String ureBinPath =
OpenOfficeLocation.getOpenOfficeLocation().getUreBinPath();
// np exception? should not happen this far in the code
if (OpenOfficeLocation.getOpenOfficeLocation().isThreeLayerOffice()) {
sdkBinPath = sdkPath.concat(File.separator).concat("bin"); //
NOI18N
