LANG: Refactor-add a basic BundleModel

plugin_ide.core/META-INF/MANIFEST.MF

@@ -29,6 +29,7 @@ Export-Package: LANG_PROJECT_ID.ide.core,
  melnorme.lang.ide.core.operations,
  melnorme.lang.ide.core.operations.build,
  melnorme.lang.ide.core.project_model,
+ melnorme.lang.ide.core.project_model.view,
  melnorme.lang.ide.core.text,
  melnorme.lang.ide.core.utils,
  melnorme.lang.ide.core.utils.operation,

plugin_ide.core/src-lang/melnorme/lang/ide/core/project_model/view/AbstractBundleModelElement.java

@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
+ * 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:
+ *     Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
+package melnorme.lang.ide.core.project_model.view;
+
+import static melnorme.utilbox.core.CoreUtil.areEqual;
+
+import melnorme.utilbox.misc.MiscUtil;
+
+public abstract class AbstractBundleModelElement<PARENT> implements IBundleModelElement {
+
+	protected final PARENT parent;
+
+	public AbstractBundleModelElement(PARENT parent) {
+		this.parent = parent;
+	}
+
+	@Override
+	public boolean equals(Object other) {
+		if(this == other) {
+			return true;
+		}
+		if(!(other instanceof IBundleModelElement)) {
+			return false;
+		}
+		IBundleModelElement otherElement = (IBundleModelElement) other;
+
+		if(this.getElementType() != otherElement.getElementType()) {
+			return false;
+		}
+		if(!areEqual(this.getElementName(), otherElement.getElementName())) {
+			return false;
+		}
+
+		return areEqual(this.getParent(), otherElement.getParent());
+	}
+
+	@Override
+	public int hashCode() {
+		return MiscUtil.combineHashCodes(getParent().hashCode(), getElementName().hashCode());
+	}
+
+	@Override
+	public String toString() {
+		return getPathString() + "  #" + getClass().getSimpleName();
+	}
+	@Override
+	public PARENT getParent() {
+		return parent;
+	}
+
+	@Override
+	public boolean hasChildren() {
+		return false;
+	}
+	@Override
+	public Object[] getChildren() {
+		return null;
+	}
+
+}

plugin_ide.core/src-lang/melnorme/lang/ide/core/project_model/view/AbstractDependenciesContainer.java

@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
+ * 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:
+ *     Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
+package melnorme.lang.ide.core.project_model.view;
+
+
+import static melnorme.utilbox.core.Assert.AssertNamespace.assertNotNull;
+
+import org.eclipse.core.resources.IProject;
+
+import melnorme.lang.ide.core.BundleModelElementKind;
+
+public abstract class AbstractDependenciesContainer<BUNDLEINFO> extends AbstractBundleModelElement<IProject> {
+
+	protected final BUNDLEINFO bundleInfo;
+	protected final IBundleModelElement[] depElements;
+
+	public AbstractDependenciesContainer(BUNDLEINFO bundleInfo, IProject project) {
+		super(project);
+		this.bundleInfo = assertNotNull(bundleInfo);
+		depElements = createChildren();
+	}
+
+	protected abstract IBundleModelElement[] createChildren();
+
+	@Override
+	public BundleModelElementKind getElementType() {
+		return BundleModelElementKind.DEP_CONTAINER;
+	}
+
+	public BUNDLEINFO getBundleInfo() {
+		return bundleInfo;
+	}
+
+	public IProject getProject() {
+		return getParent();
+	}
+
+	@Override
+	public String getElementName() {
+		return "{Dependencies}";
+	}
+
+	@Override
+	public String getPathString() {
+		return getProject().getFullPath().toPortableString() + "/" + getElementName();
+	}
+
+	@Override
+	public boolean hasChildren() {
+		return depElements.length > 0;
+	}
+
+	@Override
+	public IBundleModelElement[] getChildren() {
+		return depElements;
+	}
+
+}

plugin_ide.core/src-lang/melnorme/lang/ide/core/project_model/view/AbstractRawDependencyElement.java

@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
+ * 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:
+ *     Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
+package melnorme.lang.ide.core.project_model.view;
+
+
+import melnorme.lang.ide.core.BundleModelElementKind;
+import melnorme.lang.tooling.bundle.DependencyRef;
+
+public abstract class AbstractRawDependencyElement<PARENT extends IBundleModelElement> 
+		extends AbstractBundleModelElement<PARENT> {
+
+	protected final DependencyRef dependencyRef;
+
+	public AbstractRawDependencyElement(PARENT parent, DependencyRef dependencyRef) {
+		super(parent);
+		this.dependencyRef = dependencyRef;
+	}
+
+	public String getBundleName() {
+		return dependencyRef.bundleName;
+	}
+
+	@Override
+	public BundleModelElementKind getElementType() {
+		return BundleModelElementKind.DEP_REFERENCE;
+	}
+
+	@Override
+	public String getElementName() {
+		return getBundleName();
+	}
+
+	@Override
+	public String getPathString() {
+		return getParent().getPathString() + "/@" + getElementName();
+	}
+
+}

plugin_ide.core/src-lang/melnorme/lang/ide/core/project_model/view/BundleErrorElement.java

@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Bruno Medeiros and other Contributors.
+ * 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:
+ *     Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
+package melnorme.lang.ide.core.project_model.view;
+
+import static melnorme.utilbox.core.Assert.AssertNamespace.assertNotNull;
+
+import melnorme.lang.ide.core.BundleModelElementKind;
+
+public class BundleErrorElement extends AbstractBundleModelElement<IBundleModelElement> {
+
+	public final String errorDescription;
+
+	public BundleErrorElement(IBundleModelElement parent, String errorDescription) {
+		super(parent);
+		this.errorDescription = assertNotNull(errorDescription);
+	}
+
+	@Override
+	public BundleModelElementKind getElementType() {
+		return BundleModelElementKind.ERROR_ELEMENT;
+	}
+
+	@Override
+	public String getElementName() {
+		return "<error>";
+	}
+
+	@Override
+	public String getPathString() {
+		return getParent().getPathString() + "/" + getElementName();
+	}
+}

plugin_ide.core/src-lang/melnorme/lang/ide/core/project_model/view/IBundleModelElement.java

@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
+ * 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:
+ *     Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
+package melnorme.lang.ide.core.project_model.view;
+
+import melnorme.lang.ide.core.BundleModelElementKind;
+import melnorme.lang.ide.core.INavigatorElement_Actual;
+
+public interface IBundleModelElement extends INavigatorElement_Actual {
+
+	Object getParent();
+
+	boolean hasChildren();
+
+	/** Returns the node's children. */
+	Object[] getChildren();
+
+	public String getElementName();
+
+	public BundleModelElementKind getElementType();
+
+	public String getPathString();
+
+}

plugin_ide.core/src/melnorme/lang/ide/core/BundleModelElementKind.java

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
+ * 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:
+ *     Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
+package melnorme.lang.ide.core;
+
+import melnorme.lang.tooling.LANG_SPECIFIC;
+
+@LANG_SPECIFIC
+public enum BundleModelElementKind {
+	DEP_CONTAINER,
+	DEP_REFERENCE,
+
+	RESOLVED_DEP,
+	STANDARD_LIB,
+
+	ERROR_ELEMENT,
+
+	DEP_SRC_FOLDER,
+}

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/navigator/ElementContainer.java

@@ -13,6 +13,7 @@
 
 import static melnorme.utilbox.core.Assert.AssertNamespace.assertTrue;
 
+import melnorme.lang.ide.core.INavigatorElement_Actual;
 import melnorme.utilbox.collections.ArrayList2;
 import melnorme.utilbox.collections.Indexable;
 

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/navigator/NavigatorElementsSwitcher_Default.java

@@ -12,22 +12,32 @@
 
 import org.eclipse.core.resources.IProject;
 
+import melnorme.lang.ide.core.project_model.view.IBundleModelElement;
+
 interface NavigatorElementsSwitcher_Default<RET> {
 
 	default RET switchElement(Object element) {
 		if(element instanceof IProject) {
 			return visitProject((IProject) element);
-		} else if(element instanceof BuildTargetsContainer) {
+		} 
+		else if(element instanceof BuildTargetsContainer) {
 			return visitBuildTargetsElement((BuildTargetsContainer) element);
-		} else if(element instanceof BuildTargetElement) {
+		} 
+		else if(element instanceof BuildTargetElement) {
 			return visitBuildTarget((BuildTargetElement) element);
-		} else {
+		} 
+		else if(element instanceof IBundleModelElement) {
+			return visitBundleElement((IBundleModelElement) element);
+		} 
+		else {
 			return visitOther(element);
 		}
 	}
 
 	public abstract RET visitProject(IProject project);
 
+	public abstract RET visitBundleElement(IBundleModelElement bundleElement);
+
 	public abstract RET visitBuildTargetsElement(BuildTargetsContainer buildTargetsContainer);
 
 	public abstract RET visitBuildTarget(BuildTargetElement buildTarget);