Changeset 1186

Timestamp:

06/08/08 05:52:29 (3 months ago)

Author:

fraserofthenight

Message:

Builder UI... it's starting to get somewhere.

Files:

• trunk/descent.building/src/descent/internal/building/BuildingPlugin.java (modified) (2 diffs)
• trunk/descent.building/src/descent/internal/building/compiler/ui/GdcUIOptions.java (modified) (3 diffs)
• trunk/descent.building/src/descent/internal/building/ui/GeneralTab.java (modified) (10 diffs)
• trunk/descent.building/src/descent/internal/building/ui/VersionTab.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/core/Member.java (modified) (1 diff)
• trunk/descent.unittest/flute/.classpath (modified) (1 diff)
• trunk/descent.unittest/testdata/.classpath (modified) (1 diff)

trunk/descent.building/src/descent/internal/building/BuildingPlugin.java

@@ -8 +8 @@
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -114 +115 @@
-        return null;
-    }
+    
+    /**
+     * Returns a section in the Java plugin's dialog settings. If the section doesn't exist yet, it is created.
+     *
+     * @param name the name of the section
+     * @return the section of the given name
+     */
+    public IDialogSettings getDialogSettingsSection(String name) {
+        IDialogSettings dialogSettings= getDialogSettings();
+        IDialogSettings section= dialogSettings.getSection(name);
+        if (section == null) {
+            section= dialogSettings.addNewSection(name);
+        }
+        return section;
+    }
-    
-    public static String getUniqueIdentifier()

trunk/descent.building/src/descent/internal/building/compiler/ui/GdcUIOptions.java

@@ -124 +124 @@
-        (
-                ATTR_ALL_SOURCES,
-AUTO
+NORMAL
-                "Emit templates",
-                GROUP_GENERATED_CODE,
-                new String[]
-                {
+                    EMIT_TEMPLATES_NORMAL,
-                    EMIT_TEMPLATES_AUTO,
-                    EMIT_TEMPLATES_NORMAL,
-                    EMIT_TEMPLATES_PRIVATE,
-                    EMIT_TEMPLATES_ALL,
@@ -137 +137 @@
-                new String[]
-                {
+                    "Normal",
-                    "Auto",
-                    "Normal",
-                    "Private",
-                    "All",
@@ -144 +144 @@
-                },
-                "<p>Controls whether or not template code is emitted:</p>" +
+                "<li>Normal -- Emit templates, expecting multiple copies to be merged by the linker.</li>" +
-                "<li>Auto -- For targets that support templates, the \"all\" mode is used.  Otherwise, the \"private\" mode is used.</li>" +
-                "<li>Normal -- Emit templates, expecting multiple copies to be merged by the linker.</li>" +
-                "<li>Private -- Emit templates, but make them private to the translation unit.  The executable will have multiple copies of code and data.</li>" +
-                "<li>All -- Emit all template instances with public visibility.  Do this even if they would not normally be emitted.</li>" +

trunk/descent.building/src/descent/internal/building/ui/GeneralTab.java

@@ -1 +1 @@
-package descent.internal.building.ui;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IMemento;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
+
+
+
+
+
-import descent.core.IJavaProject;
+import descent.core.IMethod;
+import descent.core.IPackageFragment;
+import descent.core.IPackageFragmentRoot;
+import descent.core.IParent;
-import descent.core.JavaCore;
-import descent.core.JavaModelException;
@@ -111 +136 @@
-         * text field, or null if the text does not match a project name.
-         */
-rivate
+ublic
-        {
-            String projectName = fText.getText().trim();
@@ -263 +288 @@
-                return BuilderUtil.EXTENSION_STATIC_LIBRARY;
-        }
+
+        public boolean isExecutable()
+        {
+            return fExecutableRadio.getSelection();
+        }
-    }
-    
@@ -421 +451 @@
-    private final class ModulesSetting implements ISetting
-    {
+        private final class ModuleSearchDialog extends FilteredItemsSelectionDialog
+        {
+            private IJavaElement[] fElements;
+            private boolean fOnlyMain;
+            private Button fOnlyMainCheckbox;
+            
+            public ModuleSearchDialog(Shell shell, boolean onlyMain)
+            {
+                super(shell);
+                fOnlyMain = onlyMain;
+                
+                final ILabelProvider labelProvider = new JavaElementLabelProvider();
+                setTitle("Select included module/package");
+                setListLabelProvider(labelProvider);
+                setSelectionHistory(new SelectionHistory()
+                {
+                    @Override
+                    protected Object restoreItemFromMemento(IMemento memento)
+                    {
+                        IJavaElement element = JavaCore.create(memento.getTextData());
+                        if(null == element || !element.exists())
+                            return null;
+                        if(!(element instanceof ICompilationUnit) &&
+                           !(element instanceof IPackageFragment))
+                            return null;
+                        return element;
+                    }
+
+                    @Override
+                    protected void storeItemToMemento(Object item,
+                            IMemento memento)
+                    {
+                        memento.putTextData(((IJavaElement) item).
+                                getHandleIdentifier());
+                    }
+                });
+                setDetailsLabelProvider(new LabelProvider()
+                {
+                    @Override
+                    public Image getImage(Object element)
+                    {
+                        IPackageFragment pkg = getPackage(element);
+                        return null == pkg ? null : labelProvider.getImage(pkg);
+                    }
+
+                    @Override
+                    public String getText(Object element)
+                    {
+                        IPackageFragment pkg = getPackage(element);
+                        return null == pkg ? "" : labelProvider.getText(pkg);
+                    }
+                    
+                    private IPackageFragment getPackage(Object element)
+                    {
+                        if(element instanceof ICompilationUnit)
+                            return (IPackageFragment) ((ICompilationUnit) element).
+                                    getAncestor(IJavaElement.PACKAGE_FRAGMENT);
+                        else
+                            return null;
+                    }
+                });
+                
+                initializeElements();
+            }
+
+            @Override
+            protected Control createExtendedContentArea(Composite parent)
+            {
+                Composite comp = new Composite(parent, SWT.NONE);
+                GridLayout layout = new GridLayout();
+                layout.numColumns = 1;
+                comp.setLayout(layout);
+                
+                fOnlyMainCheckbox = new Button(comp, SWT.CHECK);
+                fOnlyMainCheckbox.setText("Show only modules with main function");
+                GridData gd = new GridData();
+                gd.horizontalSpan = 1;
+                fOnlyMainCheckbox.setLayoutData(gd);
+                fOnlyMainCheckbox.setSelection(fOnlyMain);
+                
+                fOnlyMainCheckbox.addSelectionListener(new SelectionAdapter()
+                {
+                    @Override
+                    public void widgetSelected(SelectionEvent e)
+                    {
+                        fOnlyMain = fOnlyMainCheckbox.getSelection();
+                        // TODO make this work -- refresh() doesn't, reloadCahce()
+                        // doesn't, scheduleRefresh() doesn't... there seems to be
+                        // no way to make the thing either filter the content or
+                        // reload the list programatically
+                    }
+                });
+                
+                return comp;
+            }
+
+            @Override
+            protected ItemsFilter createFilter()
+            {
+                return new ItemsFilter()
+                {
+                    public boolean isConsistentItem(Object item)
+                    {
+                        return true;
+                    }
+                    
+                    public boolean matchItem(Object item)
+                    {
+                        return matches(getName(item));
+                    }
+                };
+            }
+
+            @Override
+            protected void fillContentProvider(
+                    AbstractContentProvider contentProvider,
+                    ItemsFilter itemsFilter, IProgressMonitor pm)
+                    throws CoreException
+            {
+                for(IJavaElement element : fElements)
+                    contentProvider.add(element, itemsFilter);
+            }
+
+            @Override
+            protected IDialogSettings getDialogSettings()
+            {
+                return BuildingPlugin.getDefault().getDialogSettingsSection(
+                        MODULES_SEARCH_DIALOG_SETTINGS_ID);
+            }
+
+            @Override
+            public String getElementName(Object element)
+            {
+                return getName(element);
+            }
+
+            @Override
+            protected Comparator getItemsComparator()
+            {
+                return new Comparator()
+                {
+                    public int compare(Object o1, Object o2)
+                    {
+                        if(o1.getClass().equals(o2.getClass()))
+                        {
+                            String name1 = getName(o1);
+                            String name2 = getName(o2);
+                            return name1.compareTo(name2);
+                        }
+                        else
+                        {
+                            // Always show modules before packages
+                            return o1 instanceof ICompilationUnit ? -1 : 1;
+                        }
+                    }
+                };
+            }
+
+            @Override
+            protected IStatus validateItem(Object item)
+            {
+                // Anything that'd made it this far is valid
+                return Status.OK_STATUS;
+            }
+            
+            private String getName(Object element)
+            {
+                // PERHAPS why do modules have a ".d" there?
+                return ((IJavaElement) element).getElementName();
+            }
+            
+            private void initializeElements()
+            {
+                try
+                {
+                    // Get the seed projects
+                    IJavaProject project = projectSetting.getJavaProject();
+                    IJavaProject[] projects;
+                    if((null == project) || !project.exists())
+                    {
+                        IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
+                        projects = model.getJavaProjects();
+                    }
+                    else
+                    {
+                        projects = new IJavaProject[] { project };
+                    }
+                    
+                    Set<IJavaElement> elements = new HashSet<IJavaElement>();
+                    for(IJavaProject current : projects)
+                        for(IPackageFragmentRoot root : current.getAllPackageFragmentRoots())
+                            if(!root.isArchive())
+                                collectRecursive(elements, root);
+                    fElements = elements.toArray(new IJavaElement[elements.size()]);
+                }
+                catch(JavaModelException e)
+                {
+                    BuildingPlugin.log(e);
+                    fElements = new IJavaElement[] { };
+                }
+            }
+            
+            private void collectRecursive(Set<IJavaElement> elements, IParent parent)
+            {
+                try
+                {
+                    for(IJavaElement child : parent.getChildren())
+                    {
+                        if(child instanceof IPackageFragmentRoot)
+                        {
+                            collectRecursive(elements, (IPackageFragmentRoot) child);
+                        }
+                        else if(child instanceof IPackageFragment)
+                        {
+                            IPackageFragment pkg = (IPackageFragment) child;
+                            boolean hasChildren = pkg.containsJavaResources();
+                            if(!pkg.isDefaultPackage() && hasChildren)
+                                elements.add(child);
+                            if(hasChildren)
+                                collectRecursive(elements, pkg);
+                        }
+                        else if(child instanceof ICompilationUnit)
+                        {
+                            elements.add(child);
+                        }
+                    }
+                }
+                catch(JavaModelException e)
+                {
+                    // Guess we can't collect from this one... :-(
+                }
+            }
+        }
+        
-        private ListDialogField fList;
-        
@@ -461 +725 @@
-                public void dialogFieldChanged(DialogField field)
-                {
-validatePage
+settingUpdated
-                }
-            }
@@ -468 +732 @@
-            comp = createGroup(comp, "Included modules", 3, 3, GridData.FILL_HORIZONTAL);
-            
-
+
+
+
-            newHelpLabel(comp, "- For an executable, choose the module containing main()");
-            newHelpLabel(comp, "- For a library, choose all exported modules");
@@ -479 +745 @@
-                    new JavaElementLabelProvider());
-            fList.setDialogFieldListener(adapter);
+            fList.setViewerSorter(new JavaElementSorter());
-            fList.setRemoveButtonIndex(IDX_REMOVE);
-
-
-
-
-
+
-            fList.doFillIntoGrid(comp, 3);
-        }
@@ -499 +762 @@
-        private void performAdd()
-        {
-
+
+
+
-        }
-        
-        private void performEdit(ListDialogField field)
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        public void initializeFrom(ILaunchConfiguration config)
-        {
-
+
+
+
+
+
+
+
+
+
+
-        }
-
-        public void performApply(ILaunchConfigurationWorkingCopy config)
-        {
-
+
+
+
+
+
-        }
-
-        public void setDefaults(ILaunchConfigurationWorkingCopy config)
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        public String validate()
-        {
+            List<IJavaElement> elements = fList.getElementsNoCopy();
+            
+            if(elements.isEmpty())
+                return "Must specify at least one included module";
+            
+            for(IJavaElement element : elements)
+            {
+                if(!(element instanceof ICompilationUnit) &&
+                   !(element instanceof IPackageFragment)) 
+                    return String.format("Element %1s is not a module or package",
+                            element.getElementName());
+                
+                if(!element.exists())
+                    return String.format("Element %1$s does not exist",
+                            element.getElementName());
+            }
+            
-            return null;
-            /*
-            List<String> modules = fList.getElementsNoCopy();
-            
-            if(modules.isEmpty())
-                return "Module list is empty";
-            
-            // TODO validate the individual modules... maybe (maybe instead
-            // have a check button, since this can be a lengthy operation?)
-            
-            return null;*/
-        }
-    }
+    
+    //--------------------------------------------------------------------------
+    // Constants
+    
+    private static final String MODULES_SEARCH_DIALOG_SETTINGS_ID =
+        BuildingPlugin.PLUGIN_ID + "MODULES_SEARCH_DIALOG_SETTINGS";
-    
-    //--------------------------------------------------------------------------
@@ -544 +893 @@
-    private OutputTypeSetting outputTypeSetting;
-    private OutputFileSetting outputFileSetting;
+    private ProjectSetting projectSetting;
-    
-    public String getName()
@@ -561 +911 @@
-        outputTypeSetting = new OutputTypeSetting();
-        outputFileSetting = new OutputFileSetting();
+        projectSetting = new ProjectSetting();
-        return new ISetting[]
-        {
-new ProjectSetting()
+projectSetting
-            new GroupSetting("Output target", 3, 3, GridData.FILL_HORIZONTAL,
-                new ISetting[]

trunk/descent.building/src/descent/internal/building/ui/VersionTab.java

@@ -186 +186 @@
-        private Set fIdents;
-        private TableViewer fViewer;
-New
+Add
-        private Button fRemoveButton;
-        
@@ -386 +386 @@
-                public void widgetSelected(SelectionEvent e)
-                {
-New
+Add
-                    {
-                        fViewer.add("");
@@ -411 +411 @@
-            comp.setLayout(layout);
-            
-NewButton = createButton(comp, listener, "New
+AddButton = createButton(comp, listener, "Add
-            fRemoveButton = createButton(comp, listener, "Remove");
-        }

trunk/descent.core/src/descent/internal/core/Member.java

@@ -364 +364 @@
-}
-protected boolean isMainMethod(IMethod method) throws JavaModelException {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return false;

trunk/descent.unittest/flute/.classpath

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-
+src
-    <classpathentry kind="con" path="descent.launching.JRE_CONTAINER"/>
-
+bin
-</classpath>

trunk/descent.unittest/testdata/.classpath

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-
+src
-    <classpathentry kind="con" path="descent.launching.JRE_CONTAINER"/>
-
+bin
-</classpath>