svn commit: r1601884 - in /openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions: config/office/WinLocator.java util/ProjectCreator.java

[jsc]

Author: jsc
Date: Wed Jun 11 13:18:42 2014
New Revision: 1601884

URL: http://svn.apache.org/r1601884
Log:
minor changes for nb8 and aoo4.x

Modified:
    
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/WinLocator.java
    
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/ProjectCreator.java

Modified: 
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/WinLocator.java
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/WinLocator.java?rev=1601884&r1=1601883&r2=1601884&view=diff
==============================================================================
--- 
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/WinLocator.java
 (original)
+++ 
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/office/WinLocator.java
 Wed Jun 11 13:18:42 2014
@@ -58,8 +58,7 @@ public class WinLocator extends Platform
                 String path = mOfficePath.getCanonicalPath();
                 mJuhJurtRidlPath = path.concat("\\program\\classes"); // NOI18N
                 mJutUnoilPath = mJuhJurtRidlPath;
-                mUreBinPath = mSdkPath.getCanonicalPath().concat(
-                        PlatformInfo.getPlatformBinDir()).concat("\\bin");
+                mUreBinPath = path.concat("\\program");
                 mPathVariable = path.concat("\\program").concat(";").concat( 
// NOI18N
                         mUreBinPath);
                 mUnorcPath = path.concat("\\program");

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=1601884&r1=1601883&r2=1601884&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
 Wed Jun 11 13:18:42 2014
@@ -511,8 +511,9 @@ 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("bin"); // 
NOI18N
+        String sdkBinPath = 
OpenOfficeLocation.getOpenOfficeLocation().getSdkPath().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
@@ -565,6 +566,13 @@ public class ProjectCreator {
             }
 
             ScriptExecutor.executeScript(command, 
(File)wiz.getProperty("projdir")); // NOI18N
+            if (ScriptExecutor.hasErrors()) {  // message box with errors...
+                String message = NbBundle.getMessage(ProjectCreator.class, 
"ERROR_CommandExecute").concat(
+                    "\n").concat(ScriptExecutor.getErrors()); // NOI18N
+                JOptionPane.showMessageDialog(null, message,
+                    NbBundle.getMessage(ProjectCreator.class, 
"LOG_Level_critical"), JOptionPane.ERROR_MESSAGE); // NOI18N
+                executeWorked = false;
+            }
             LogWriter.getLogWriter().log(LogWriter.LEVEL_INFO, 
ScriptExecutor.getOutput());
             LogWriter.getLogWriter().log(LogWriter.LEVEL_CRITICAL, 
ScriptExecutor.getErrors());