[#267] remove useless deps to cross.arm & packs.ui

- move IconUtils to packs.core
- duplicate IDs to core

Author: ilg-ul

bundles/ilg.gnumcueclipse.core/src/ilg/gnumcueclipse/core/IDs.java

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Liviu Ionescu.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Liviu Ionescu - initial version
+ *******************************************************************************/
+
+package ilg.gnumcueclipse.core;
+
+public class IDs {
+
+	// ------------------------------------------------------------------------
+
+	// This is a hack, to avoid a dependency on the cross.arm plug-in.
+	// Keep it in sync.
+	public static final String TOOLCHAIN_ARM_ID = "ilg.gnuarmeclipse.managedbuild.cross.toolchain";
+
+	// ------------------------------------------------------------------------
+
+}

bundles/ilg.gnumcueclipse.debug.packs/META-INF/MANIFEST.MF

@@ -7,7 +7,6 @@ Bundle-Activator: ilg.gnumcueclipse.debug.packs.Activator
 Require-Bundle: ilg.gnumcueclipse.core,
  ilg.gnumcueclipse.packs.core,
  ilg.gnumcueclipse.packs.data,
- ilg.gnumcueclipse.managedbuild.cross.arm,
  org.eclipse.cdt.dsf;bundle-version="2.8.0",
  org.eclipse.cdt.dsf.gdb;bundle-version="5.2.0",
  org.eclipse.cdt.dsf.gdb.ui;bundle-version="2.6.0",

bundles/ilg.gnumcueclipse.managedbuild.packs/META-INF/MANIFEST.MF

@@ -5,10 +5,8 @@ Bundle-SymbolicName: ilg.gnumcueclipse.managedbuild.packs;singleton:=true
 Bundle-Version: 1.3.2.qualifier
 Bundle-Activator: ilg.gnumcueclipse.managedbuild.packs.Activator
 Require-Bundle: ilg.gnumcueclipse.core,
- ilg.gnumcueclipse.managedbuild.cross.arm,
  ilg.gnumcueclipse.packs.core,
  ilg.gnumcueclipse.packs.data,
- ilg.gnumcueclipse.packs.ui,
  org.eclipse.cdt.core;bundle-version="6.2.0",
  org.eclipse.cdt.managedbuilder.core;bundle-version="8.4.0",
  org.eclipse.cdt.managedbuilder.ui;bundle-version="9.0.0",

bundles/ilg.gnumcueclipse.managedbuild.packs/src/ilg/gnumcueclipse/managedbuild/packs/ui/views/DocsView.java

@@ -13,7 +13,7 @@
 
 import ilg.gnumcueclipse.core.CProjectPacksStorage;
 import ilg.gnumcueclipse.core.EclipseUtils;
-import ilg.gnumcueclipse.managedbuild.cross.arm.IDs;
+import ilg.gnumcueclipse.core.IDs;
 import ilg.gnumcueclipse.managedbuild.packs.Activator;
 import ilg.gnumcueclipse.packs.core.data.PacksStorage;
 import ilg.gnumcueclipse.packs.core.tree.AbstractTreePreOrderIterator;
@@ -23,10 +23,10 @@
 import ilg.gnumcueclipse.packs.core.tree.NodeViewContentProvider;
 import ilg.gnumcueclipse.packs.core.tree.Property;
 import ilg.gnumcueclipse.packs.core.tree.Type;
+import ilg.gnumcueclipse.packs.core.ui.IconUtils;
 import ilg.gnumcueclipse.packs.data.DataManager;
 import ilg.gnumcueclipse.packs.data.DataManagerEvent;
 import ilg.gnumcueclipse.packs.data.IDataManagerListener;
-import ilg.gnumcueclipse.packs.ui.IconUtils;
 
 import java.io.IOException;
 import java.net.URL;
@@ -373,7 +373,7 @@ private IConfiguration getConfigurationForProject(IProject project) {
 
 				IToolChain toolchain = config.getToolChain();
 				String sToolchainId = toolchain.getBaseId();
-				if (sToolchainId.startsWith(IDs.TOOLCHAIN_ID + ".")) {
+				if (sToolchainId.startsWith(IDs.TOOLCHAIN_ARM_ID + ".")) {
 
 					// Only our projects are candidates
 					newConfig = config;

bundles/ilg.gnumcueclipse.packs.core/META-INF/MANIFEST.MF

@@ -12,6 +12,7 @@ Export-Package: ilg.gnumcueclipse.packs.core,
  ilg.gnumcueclipse.packs.core.data,
  ilg.gnumcueclipse.packs.core.jstree,
  ilg.gnumcueclipse.packs.core.tree,
+ ilg.gnumcueclipse.packs.core.ui,
  ilg.gnumcueclipse.packs.core.xml
 Require-Bundle: ilg.gnumcueclipse.core,
  org.eclipse.core.resources;bundle-version="3.11.1",

bundles/ilg.gnumcueclipse.packs.core/build.properties

@@ -4,4 +4,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                plugin.properties,\
-               .options
+               .options,\
+               icons/

bundles/ilg.gnumcueclipse.packs.core/icons/chm.png

@@ -9,16 +9,17 @@
  *     Liviu Ionescu - initial implementation.
  *******************************************************************************/
 
-package ilg.gnumcueclipse.packs.ui;
+package ilg.gnumcueclipse.packs.core.ui;
 
 import org.eclipse.swt.graphics.Image;
 
+import ilg.gnumcueclipse.packs.core.Activator;
 import ilg.gnumcueclipse.packs.core.tree.Leaf;
 import ilg.gnumcueclipse.packs.core.tree.Node;
 
 public class IconUtils {
 
-	public static final String ICONS_PLUGIN_ID = "ilg.gnumcueclipse.packs.ui";
+	public static final String ICONS_PLUGIN_ID = "ilg.gnumcueclipse.packs.core";
 
 	public static Image getBookIcon(Leaf node) {
 

bundles/ilg.gnumcueclipse.packs.core/icons/external_browser.png

@@ -57,10 +57,10 @@
 import ilg.gnumcueclipse.packs.core.tree.PackNode;
 import ilg.gnumcueclipse.packs.core.tree.Property;
 import ilg.gnumcueclipse.packs.core.tree.Type;
+import ilg.gnumcueclipse.packs.core.ui.IconUtils;
 import ilg.gnumcueclipse.packs.data.DataManager;
 import ilg.gnumcueclipse.packs.jobs.ParsePdscRunnable;
 import ilg.gnumcueclipse.packs.ui.Activator;
-import ilg.gnumcueclipse.packs.ui.IconUtils;
 
 public class OutlineView extends ViewPart {