From 3e9555d9b53e3f0ecfbd102cda7f372e86c7b636 Mon Sep 17 00:00:00 2001
From: Timotei Dolean <timotei21@gmail.com>
Date: Mon, 8 Aug 2011 21:27:26 +0000
Subject: [PATCH] eclipse plugin: Start working on adding a core library...

...link to each project for an easier reference
---
 utils/umc_dev/org.wesnoth/plugin.xml          | 43 ++++++++++++++++
 .../builder/DependencyListBuilder.java        |  7 +++
 .../builder/WesnothProjectBuilder.java        |  9 ++++
 .../views/WesnothProjectsExplorer.java        |  2 +
 .../WesnothProjectsExplorerViewerSorter.java  | 50 +++++++++++++++++++
 5 files changed, 111 insertions(+)
 create mode 100644 utils/umc_dev/org.wesnoth/src/org/wesnoth/views/WesnothProjectsExplorerViewerSorter.java

diff --git a/utils/umc_dev/org.wesnoth/plugin.xml b/utils/umc_dev/org.wesnoth/plugin.xml
index 95c7dc00fa0..772f29354dc 100644
--- a/utils/umc_dev/org.wesnoth/plugin.xml
+++ b/utils/umc_dev/org.wesnoth/plugin.xml
@@ -301,6 +301,34 @@
             wizardId="org.wesnoth.wizards.wizardLauncher">
          <enablement></enablement>
       </commonWizard>
+      <navigatorContent
+            activeByDefault="true"
+            appearsBefore="org.eclipse.ui.navigator.resourceContent"
+            contentProvider="org.eclipse.ui.internal.navigator.resources.workbench.ResourceExtensionContentProvider"
+            icon="icons/wesnoth-icon_16.png"
+            id="org.wesnoth.wesnothNavigatorContent"
+            labelProvider="org.eclipse.ui.internal.navigator.resources.workbench.ResourceExtensionLabelProvider"
+            name="Wesnoth Resources"
+            priority="highest"
+            sortOnly="true">
+        <enablement>
+             <or>         
+                <instanceof 
+                        value="org.eclipse.core.resources.IResource" /> 
+             </or>
+        </enablement>
+        <commonSorter
+              class="org.wesnoth.views.WesnothProjectsExplorerViewerSorter"
+              id="org.wesnoth.navigator.wesnothContentSorter">
+           <parentExpression>
+              <or>
+                 <instanceof
+                       value="org.wesnoth.views.WesnothProjectsExplorer">
+                 </instanceof>
+              </or>
+           </parentExpression>
+        </commonSorter>
+      </navigatorContent>
    </extension>
    <extension
          point="org.eclipse.ui.navigator.viewer">
@@ -316,9 +344,24 @@
             <contentExtension
                   pattern="org.eclipse.ui.navigator.resources.filters.*">
             </contentExtension>
+            <contentExtension
+                  pattern="org.eclipse.ui.navigator.resources.linkHelper">
+            </contentExtension>
+            <contentExtension
+                  pattern="org.eclipse.ui.navigator.resources.workingSets">
+            </contentExtension>
+            <contentExtension
+                  pattern="org.eclipse.ui.navigator.resources.filters.*">
+            </contentExtension>
             <contentExtension
                   pattern="org.wesnoth.navigator.filters.*">
             </contentExtension>
+            <contentExtension
+                  pattern="org.wesnoth.wesnothNavigatorContent">
+            </contentExtension>
+            <contentExtension
+                  pattern="org.wesnoth.navigator.wesnothContentSorter">
+            </contentExtension>
          </includes>
       </viewerContentBinding>
       <viewerActionBinding
diff --git a/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyListBuilder.java b/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyListBuilder.java
index 5d418edd56a..68102d8d67e 100644
--- a/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyListBuilder.java
+++ b/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyListBuilder.java
@@ -27,6 +27,7 @@ import org.wesnoth.Logger;
 import org.wesnoth.utils.ResourceUtils;
 import org.wesnoth.utils.ResourceUtils.WMLFilesComparator;
 import org.wesnoth.utils.StringUtils;
+import org.wesnoth.views.WesnothProjectsExplorer;
 
 public class DependencyListBuilder implements Serializable
 {
@@ -219,6 +220,12 @@ public class DependencyListBuilder implements Serializable
             container = project_.getFolder( containerPath );
         }
 
+        // skip core library
+        if( container.getName( ).equals(
+                WesnothProjectsExplorer.CORE_LIBRARY_NAME ) ) {
+            return;
+        }
+
         IResource main_cfg = container.findMember( "_main.cfg" ); //$NON-NLS-1$
         if( main_cfg != null ) {
             // add main.cfg to list
diff --git a/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java b/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java
index 0243fede0aa..2031e3e3e21 100644
--- a/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java
+++ b/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java
@@ -19,6 +19,7 @@ import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingDeque;
 
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -42,6 +43,7 @@ import org.wesnoth.utils.ResourceUtils;
 import org.wesnoth.utils.StringUtils;
 import org.wesnoth.utils.WMLTools;
 import org.wesnoth.utils.WorkspaceUtils;
+import org.wesnoth.views.WesnothProjectsExplorer;
 import org.wesnoth.wml.SimpleWMLParser;
 import org.wesnoth.wml.WMLConfig;
 
@@ -243,6 +245,13 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
                 }
             }
 
+            // skip core library files
+            if( resource instanceof IContainer
+                    && WesnothProjectsExplorer.CORE_LIBRARY_NAME
+                            .equals( resource.getName( ) ) ) {
+                continue;
+            }
+
             deltasQueue
                     .addAll( Arrays.asList( deltaItem.getAffectedChildren( ) ) );
         }
diff --git a/utils/umc_dev/org.wesnoth/src/org/wesnoth/views/WesnothProjectsExplorer.java b/utils/umc_dev/org.wesnoth/src/org/wesnoth/views/WesnothProjectsExplorer.java
index d983ef1ff4d..0f9e8f61ce4 100644
--- a/utils/umc_dev/org.wesnoth/src/org/wesnoth/views/WesnothProjectsExplorer.java
+++ b/utils/umc_dev/org.wesnoth/src/org/wesnoth/views/WesnothProjectsExplorer.java
@@ -21,6 +21,8 @@ public class WesnothProjectsExplorer extends CommonNavigator implements
 {
     public static final String ID_PROJECTS_EXPLORER = "org.wesnoth.views.WesnothProjectsExplorer"; //$NON-NLS-1$
 
+    public static final String CORE_LIBRARY_NAME    = "Wesnoth Core Library";
+
     public WesnothProjectsExplorer( )
     {
     }
diff --git a/utils/umc_dev/org.wesnoth/src/org/wesnoth/views/WesnothProjectsExplorerViewerSorter.java b/utils/umc_dev/org.wesnoth/src/org/wesnoth/views/WesnothProjectsExplorerViewerSorter.java
new file mode 100644
index 00000000000..7745141dadc
--- /dev/null
+++ b/utils/umc_dev/org.wesnoth/src/org/wesnoth/views/WesnothProjectsExplorerViewerSorter.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2011 by Timotei Dolean <timotei21@gmail.com>
+ * 
+ * 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
+ *******************************************************************************/
+package org.wesnoth.views;
+
+import java.text.Collator;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+
+public class WesnothProjectsExplorerViewerSorter extends ViewerSorter
+{
+    public WesnothProjectsExplorerViewerSorter( )
+    {
+    }
+
+    public WesnothProjectsExplorerViewerSorter( Collator collator )
+    {
+        super( collator );
+    }
+
+    @Override
+    public int compare( Viewer viewer, Object e1, Object e2 )
+    {
+        // The core library container should be first everytime
+        int result = super.compare( viewer, e1, e2 );
+
+        if( result != 0
+            && e1 instanceof IContainer
+            && ( ( IContainer ) e1 ).getName( ).equals(
+                WesnothProjectsExplorer.CORE_LIBRARY_NAME ) ) {
+            return - 1;
+        }
+
+        if( result != 0
+            && e2 instanceof IContainer
+            && ( ( IContainer ) e2 ).getName( ).equals(
+                WesnothProjectsExplorer.CORE_LIBRARY_NAME ) ) {
+            return 1;
+        }
+
+        return result;
+    }
+}