commit a8aeb35559ad2d7df3dc62c9685c91de5919c273
author Matthias Villiger <mvi@bsiag.com> Mon Sep 09 15:16:37 2013 +0200
committer Matthias Villiger <mvi@bsiag.com> Mon Sep 09 09:22:17 2013 -0400
tree 52034ce98847a3bfbcbd1102579f06edf53d9509
parent 5ee46866ab05c3fd9ea40d1320d19393b717b8e0

Product file configuration search optimized.

Change-Id: Ib03d6710c646f31b5342aae012270bbe3806d471
Reviewed-on: https://git.eclipse.org/r/16225
Reviewed-by: Matthias Villiger <mvi@bsiag.com>
IP-Clean: Matthias Villiger <mvi@bsiag.com>
Tested-by: Matthias Villiger <mvi@bsiag.com>

org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/view/properties/presenter/single/ProductLaunchPresenter.java

diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/view/properties/presenter/single/ProductLaunchPresenter.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/view/properties/presenter/single/ProductLaunchPresenter.java
index e6c3476..3422153 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/view/properties/presenter/single/ProductLaunchPresenter.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/view/properties/presenter/single/ProductLaunchPresenter.java
@@ -14,11 +14,9 @@
 import java.util.regex.Pattern;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
@@ -30,11 +28,8 @@
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.internal.core.iproduct.IConfigurationFileInfo;
-import org.eclipse.pde.internal.core.product.WorkspaceProductModel;
 import org.eclipse.pde.internal.ui.IPDEUIConstants;
 import org.eclipse.pde.ui.launcher.EclipseLaunchShortcut;
-import org.eclipse.scout.commons.StringUtility;
 import org.eclipse.scout.sdk.Texts;
 import org.eclipse.scout.sdk.extensions.runtime.classes.RuntimeClasses;
 import org.eclipse.scout.sdk.ui.extensions.bundle.ScoutBundleUiExtension;
@@ -83,7 +78,6 @@
 
   private P_LaunchListener m_launchListener;
   private P_RecomputeLaunchStateJob m_stateUpdateJob;
-  private WorkspaceProductModel m_productModel;
 
   private final static Pattern PATTERN = Pattern.compile("name\\s*\\=\\s*(\\\")?([^\\\"]*)\\\"", Pattern.MULTILINE);
   private final static String MAC_OS_X_SWING_WARNING_MESSAGE_KEY = "scoutSwingMacOsXWarningKey";
@@ -152,15 +146,6 @@
       l.setImage(ScoutSdkUi.getDefault().getImageRegistry().get(uiExt.getLauncherIconPath()));
     }
 
-    m_productModel = null;
-    try {
-      m_productModel = new WorkspaceProductModel(getProductFile(), false);
-      m_productModel.load();
-    }
-    catch (CoreException e) {
-      ScoutSdkUi.logWarning("could not load product model of '" + getProductFile() + "'.", e);
-      return;
-    }
     Control linkPart = createLinkPart(m_mainGroup);
     Control actionPart = createActionPart(m_mainGroup);
 
@@ -183,17 +168,16 @@
   protected Control createLinkPart(Composite parent) {
     LinksPresenterModel model = new LinksPresenterModel();
     model.addGlobalLink(new FileOpenLink(getProductFile(), 10, IPDEUIConstants.PRODUCT_EDITOR_ID));
-    // find config.ini
-    IConfigurationFileInfo info = m_productModel.getProduct().getConfigurationFileInfo();
-    if (info != null) {
-      String path = info.getPath(Platform.getOS());
-      if (path == null) {
-        path = info.getPath(null);
+
+    try {
+      ProductFileModelHelper pfmh = new ProductFileModelHelper(getProductFile());
+      IFile configIni = pfmh.ConfigurationFile.getFile();
+      if (configIni != null) {
+        model.addGlobalLink(new FileOpenLink(configIni, 20, EditorsUI.DEFAULT_TEXT_EDITOR_ID));
       }
-      if (!StringUtility.isNullOrEmpty(path)) {
-        IFile configIniFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(path));
-        model.addGlobalLink(new FileOpenLink(configIniFile, 20, EditorsUI.DEFAULT_TEXT_EDITOR_ID));
-      }
+    }
+    catch (CoreException e) {
+      ScoutSdkUi.logWarning("Unable to find config.ini file for product '" + getProductFile().getLocation().toOSString() + "'.", e);
     }
 
     LinksPresenter presenter = new LinksPresenter(getToolkit(), parent, model);