svn commit: r1525454 - in /openoffice/devtools/netbeansintegration/trunk: manifest.mf src/org/openoffice/extensions/config/ConfigurationSettings.java

[cmarcum]

Author: cmarcum
Date: Sun Sep 22 21:42:00 2013
New Revision: 1525454

URL: http://svn.apache.org/r1525454
Log:
#i123266#
updated Netbeans plugin for 3-layer removal
ConfigurationSettings.java
removed platform from sdk.bin.dir


Modified:
    openoffice/devtools/netbeansintegration/trunk/manifest.mf
    
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationSettings.java

Modified: openoffice/devtools/netbeansintegration/trunk/manifest.mf
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/manifest.mf?rev=1525454&r1=1525453&r2=1525454&view=diff
==============================================================================
--- openoffice/devtools/netbeansintegration/trunk/manifest.mf (original)
+++ openoffice/devtools/netbeansintegration/trunk/manifest.mf Sun Sep 22 
21:42:00 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.4
+OpenIDE-Module-Specification-Version: 4.0.5
 
 Name: org/openoffice/extensions/filetypes/odf/OdfDataLoader.class
 OpenIDE-Module-Class: Loader

Modified: 
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationSettings.java
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationSettings.java?rev=1525454&r1=1525453&r2=1525454&view=diff
==============================================================================
--- 
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationSettings.java
 (original)
+++ 
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationSettings.java
 Sun Sep 22 21:42:00 2013
@@ -333,8 +333,8 @@ public class ConfigurationSettings {
             System.setProperty("sdk.bin.dir", 
sdkPath.concat(File.separator).concat("bin")); // NOI18N
         }
         else {
-            String platform = PlatformInfo.getPlatformBinDir();
-            System.setProperty("sdk.bin.dir", 
sdkPath.concat(File.separator).concat(platform).concat(File.separator).concat("bin"));
 // NOI18N
+            // String platform = PlatformInfo.getPlatformBinDir();
+            System.setProperty("sdk.bin.dir", 
sdkPath.concat(File.separator).concat("bin")); // NOI18N
         }
         System.setProperty("ure.bin.dir", loc.getUreBinPath()); // NOI18N
         String soPath = loc.getPathVariable();