Changeset 1150

Timestamp:

05/01/08 22:41:05 (8 months ago)

Author:

fraserofthenight

Message:

Started on a file import UI

Files:

• trunk/descent.ui/plugin.xml (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/preferences/FileImportBlock.java (modified) (2 diffs)
• trunk/descent.unittest/flute/src/org/dsource/descent/flute/io.d (modified) (1 diff)
• trunk/descent.unittest/src/descent/internal/unittest/ui/OpenModuleAction.java (modified) (1 diff)

trunk/descent.ui/plugin.xml

@@ -530 +530 @@
-         <keywordReference id="descent.ui.todo"/>
-      </page>
-      <!--
-<page
+<page
+      category="descent.ui.propertyPages.CompliancePreferencePage"
-            class="descent.internal.ui.preferences.FileImportPropertyPage"
-            id="descent.ui.propertyPages.FileImportPropertyPage"
-            name="%fileImportPageName"
-            objectClass="org.eclipse.core.resources.IProject">
-
-
+
+
+
+
+
+
+
-            class="descent.internal.ui.preferences.FileImportPropertyPage"
-            id="descent.ui.propertyPages.FileImportPropertyPage"
-            name="%fileImportPageName"
-            objectClass="descent.core.IJavaProject">
-
-
+
+
+
+
+
-      <!--
-      <page

trunk/descent.ui/src/descent/internal/ui/preferences/FileImportBlock.java

@@ -1 +1 @@
-package descent.internal.ui.preferences;
-
+import java.io.File;
+
-import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+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.Group;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
-
-
+
+
-import descent.internal.ui.wizards.IStatusChangeListener;
-
-public class FileImportBlock extends OptionsConfigurationBlock
-{
-   
+    
-    {
-        // TODO ...and then the ogre took the keys...
-    };
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    public FileImportBlock(IStatusChangeListener context,
-            IProject project,
@@ -26 +69 @@
-    @Override
-    protected Control createContents(Composite parent)
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    protected String[] getFullBuildDialogStrings(boolean workspaceSettings)
-    {

trunk/descent.unittest/flute/src/org/dsource/descent/flute/io.d

@@ -1 +1 @@
-module org.dsource.descent.flute.io;
-
+version(Tango)
+{
+    
+}
+else
+{
+    import std.file : exists, read;
+    import std.stdio: writef, fflush, stdout;
+}
+
+private IOProvider ioProvider;
+
+public IOProvider getIOProvider()
+{
+    if(null is ioProvider)
+    {
+        ioProvider = new PhobosStdioProvider();
+    }
+    
+    return ioProvider;
+}
+
+public interface IOProvider
+{
+    /**
+     * Prints the given string to the output (either a socket or stdout).
+     * 
+     * Params:
+     *     str = The string to print
+     */
+    public void write(string str);
+    
+    /**
+     * Flushes the output stream. Should be called before waiting for user input and
+     * before possibly lengthy operations to alert users.
+     */
+    public void flush();
+
+    /**
+     * Reads a line (terminated by a CRLF) from the socket and returns it.
+     * 
+     * Returns: The next line from the input stream
+     */
+    public string readln();
+    
+    /**
+     * Provides a library-independent interface for accessing a file.
+     * It is assumed the file is a smallish UTF-8 text file.
+     * 
+     * Returns: a new handle to the file or null if the file could not be
+     *          found
+     */
+    protected FileHandle getFileHandle(string filename);
+}
+
+/**
+ * Provides a library-independent interface for reading from a smallish UTF-8
+ * text file in a line-by-line manner.
+ */
+private interface FileHandle
+{
+    /**
+     * Iterates over the contents of a file line-by line.
+     */
+    public int opApply(int delegate(ref string) dg);
+}
+
+version(Tango)
+{
+    
+}
+else
+{
+    private abstract class PhobosIOProvider : IOProvider
+    {
+        protected final FileHandle getFileHandle(string filename)
+        {
+            if(exists(filename))
+            {
+                return new class(filename) FileHandle
+                {
+                    private string filename;
+                    
+                    public this(string filename)
+                    {
+                        this.filename = filename;
+                    }
+                    
+                    public int opApply(int delegate(ref string) dg)
+                    {
+                        // Read the file
+                        char[] text = cast(char[]) read(filename);
+                        
+                        // Iterate through the lines
+                        uint lineStart = 0;
+                        uint i = 0;
+                        for(; i < test.length; i++)
+                        {
+                            char c = text[i];
+                            if (c == '\n')
+                            {
+                                uint lineEnd = i;
+                                
+                                // Handle a \r\n
+                                if(lineEnd && (text[lineEnd - 1] == '\r'))
+                                    lineEnd--;
+                                
+                                char[] line = text[lineStart .. lineEnd];
+                                lineStart = i + 1;
+                                
+                                int result = dg(line);
+                                if(result)
+                                    return result;
+                            }
+                        }
+                        
+                        // Slurp up the remainder of the text as the final line
+                        if(lineStart < text.length)
+                        {
+                            char[] line = text[lineStart .. i];
+                            int result = dg(line);
+                            if(result)
+                                return result;
+                        }
+                        
+                        return 0;
+                    }
+                };
+            }
+            else
+            {
+                return null;
+            }
+        }
+    }
+    
+    private final class PhobosStdioProvider : PhobosIOProvider
+    {   
+        public void write(string str)
+        {
+            writef(str);
+        }
+        
+        public void flush()
+        {
+            fflush(stdout);
+        }
+
+        public string readln()
+        {
+            return cinReadln();
+        }
+    }
+}

trunk/descent.unittest/src/descent/internal/unittest/ui/OpenModuleAction.java

@@ -57 +57 @@
-        
-        ICompilationUnit module;
-
+
+
-        if(javaElement != null && javaElement instanceof ICompilationUnit
-            && javaElement.exists())