Merge pull request #7 from SlimerDude/feature/fantom-1.0.71

Feature/fantom 1.0.71
xored · Jul 24, 2019 · 209382f · 209382f
2 parents f86da48 + 32c1142
commit 209382f
Show file tree

Hide file tree

Showing 94 changed files with 1,167 additions and 858 deletions.
diff --git a/com.xored.fantom.classfile/META-INF/MANIFEST.MF b/com.xored.fantom.classfile/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: F4 Classfile
 Bundle-SymbolicName: com.xored.fantom.classfile;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.fantom.sys;bundle-version="1.0.69"
+Require-Bundle: org.fantom.sys;bundle-version="1.0.71"
 Bundle-Vendor: Xored software, Inc.
diff --git a/org.fantom-feature/feature.properties b/org.fantom-feature/feature.properties
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2008, 2016 Xored software, Inc.
+# Copyright (c) 2008, 2018 Xored software, Inc.
 # 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
@@ -10,7 +10,7 @@
 #-------------------------------------------------------------------------------
 copyrightURL=epl-v10.html
 copyright=\
-Copyright (c) 2008, 2016 Xored software, Inc.\n\
+Copyright (c) 2008, 2018 Xored software, Inc.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\

diff --git a/org.fantom-feature/feature.xml b/org.fantom-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.fantom"
       label="F4 Fantom Runtime"
-      version="1.0.69.qualifier"
+      version="1.0.71.qualifier"
       provider-name="Xored software, Inc."
       plugin="org.fantom">
 

diff --git a/org.fantom-feature/pom.xml b/org.fantom-feature/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.fantom-features</groupId>
   <artifactId>org.fantom</artifactId>
-  <version>1.0.69-SNAPSHOT</version>
+  <version>1.0.71-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.fantom-updatesite/site.xml b/org.fantom-updatesite/site.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.fantom_1.0.69.qualifier.jar" id="org.fantom" version="1.0.69.qualifier"/>
+   <feature url="features/org.fantom_1.0.71.qualifier.jar" id="org.fantom" version="1.0.71.qualifier"/>
 </site>
diff --git a/org.fantom.compiler/META-INF/MANIFEST.MF b/org.fantom.compiler/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fantom core pod Compiler
 Bundle-SymbolicName: org.fantom.compiler;singleton:=true
-Bundle-Version: 1.0.69.qualifier
-Require-Bundle: org.fantom.sys;bundle-version="1.0.69"
+Bundle-Version: 1.0.71.qualifier
+Require-Bundle: org.fantom.sys;bundle-version="1.0.71"
 Bundle-Vendor: Xored software, Inc.
diff --git a/org.fantom.compiler/compiler.pod b/org.fantom.compiler/compiler.pod
diff --git a/org.fantom.compiler/pom.xml b/org.fantom.compiler/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.fantom</groupId>
   <artifactId>org.fantom.compiler</artifactId>
-  <version>1.0.69-SNAPSHOT</version>
+  <version>1.0.71-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.fantom.compilerJava/META-INF/MANIFEST.MF b/org.fantom.compilerJava/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fantom core pod CompilerJava
 Bundle-SymbolicName: org.fantom.compilerJava;singleton:=true
-Bundle-Version: 1.0.69.qualifier
-Require-Bundle: org.fantom.sys;bundle-version="1.0.69",
- org.fantom.compiler;bundle-version="1.0.69"
+Bundle-Version: 1.0.71.qualifier
+Require-Bundle: org.fantom.sys;bundle-version="1.0.71",
+ org.fantom.compiler;bundle-version="1.0.71"
 Bundle-Vendor: Xored software, Inc.
diff --git a/org.fantom.compilerJava/build.fan b/org.fantom.compilerJava/build.fan
@@ -17,7 +17,7 @@ class Build : BuildPod
   new make()
   {
     podName    = "compilerJava"
-	version	   = Version("1.0.69")
+	version	   = Version("1.0.71")
     summary    = "Compiler FFI Plugin for Java"
     meta       = ["org.name":     "Fantom",
                   "org.uri":      "http://fantom.org/",

diff --git a/org.fantom.compilerJava/compilerJava.pod b/org.fantom.compilerJava/compilerJava.pod
diff --git a/org.fantom.compilerJava/fan/JavaType.fan b/org.fantom.compilerJava/fan/JavaType.fan
@@ -146,7 +146,7 @@ class JavaType : CType
 
   ** Classfile to use for loading
   const File? classfile
-  ** Modified for F4 to support content-assistance
+
   protected virtual Void load()
   {
     if (loaded) return

diff --git a/org.fantom.compilerJava/pom.xml b/org.fantom.compilerJava/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.fantom</groupId>
   <artifactId>org.fantom.compilerJava</artifactId>
-  <version>1.0.69-SNAPSHOT</version>
+  <version>1.0.71-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.fantom.compilerJs/META-INF/MANIFEST.MF b/org.fantom.compilerJs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fantom core pod CompilerJs
 Bundle-SymbolicName: org.fantom.compilerJs;singleton:=true
-Bundle-Version: 1.0.69.qualifier
-Require-Bundle: org.fantom.sys;bundle-version="1.0.69",
- org.fantom.compiler;bundle-version="1.0.69"
+Bundle-Version: 1.0.71.qualifier
+Require-Bundle: org.fantom.sys;bundle-version="1.0.71",
+ org.fantom.compiler;bundle-version="1.0.71"
 Bundle-Vendor: Xored software, Inc.
diff --git a/org.fantom.compilerJs/compilerJs.pod b/org.fantom.compilerJs/compilerJs.pod
diff --git a/org.fantom.compilerJs/pom.xml b/org.fantom.compilerJs/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.fantom</groupId>
   <artifactId>org.fantom.compilerJs</artifactId>
-  <version>1.0.69-SNAPSHOT</version>
+  <version>1.0.71-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.fantom.concurrent/META-INF/MANIFEST.MF b/org.fantom.concurrent/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fantom core pod Concurrent
 Bundle-SymbolicName: org.fantom.concurrent;singleton:=true
-Bundle-Version: 1.0.69.qualifier
-Require-Bundle: org.fantom.sys;bundle-version="1.0.69"
+Bundle-Version: 1.0.71.qualifier
+Require-Bundle: org.fantom.sys;bundle-version="1.0.71"
 Bundle-Vendor: Xored software, Inc.
diff --git a/org.fantom.concurrent/concurrent.pod b/org.fantom.concurrent/concurrent.pod
diff --git a/org.fantom.concurrent/pom.xml b/org.fantom.concurrent/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.fantom</groupId>
   <artifactId>org.fantom.concurrent</artifactId>
-  <version>1.0.69-SNAPSHOT</version>
+  <version>1.0.71-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.fantom.fandoc/META-INF/MANIFEST.MF b/org.fantom.fandoc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fantom core pod Fandoc
 Bundle-SymbolicName: org.fantom.fandoc;singleton:=true
-Bundle-Version: 1.0.69.qualifier
+Bundle-Version: 1.0.71.qualifier
 Bundle-Vendor: Xored software, Inc.
-Require-Bundle: org.fantom.sys;bundle-version="1.0.69"
+Require-Bundle: org.fantom.sys;bundle-version="1.0.71"
diff --git a/org.fantom.fandoc/fandoc.pod b/org.fantom.fandoc/fandoc.pod
diff --git a/org.fantom.fandoc/pom.xml b/org.fantom.fandoc/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.fantom</groupId>
   <artifactId>org.fantom.fandoc</artifactId>
-  <version>1.0.69-SNAPSHOT</version>
+  <version>1.0.71-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.fantom.fanr/META-INF/MANIFEST.MF b/org.fantom.fanr/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fantom core pod Fanr
 Bundle-SymbolicName: org.fantom.fanr;singleton:=true
-Bundle-Version: 1.0.69.qualifier
-Require-Bundle: org.fantom.sys;bundle-version="1.0.69",
- org.fantom.concurrent;bundle-version="1.0.69",
- org.fantom.util;bundle-version="1.0.69",
- org.fantom.web;bundle-version="1.0.69"
+Bundle-Version: 1.0.71.qualifier
+Require-Bundle: org.fantom.sys;bundle-version="1.0.71",
+ org.fantom.concurrent;bundle-version="1.0.71",
+ org.fantom.util;bundle-version="1.0.71",
+ org.fantom.web;bundle-version="1.0.71"
 Bundle-Vendor: Xored software, Inc.
diff --git a/org.fantom.fanr/fanr.pod b/org.fantom.fanr/fanr.pod
diff --git a/org.fantom.fanr/pom.xml b/org.fantom.fanr/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.fantom</groupId>
   <artifactId>org.fantom.fanr</artifactId>
-  <version>1.0.69-SNAPSHOT</version>
+  <version>1.0.71-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.fantom.fwt/META-INF/MANIFEST.MF b/org.fantom.fwt/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fantom core pod Fwt
 Bundle-SymbolicName: org.fantom.fwt;singleton:=true
-Bundle-Version: 1.0.69.qualifier
+Bundle-Version: 1.0.71.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.swt,
- org.fantom.sys;bundle-version="1.0.69",
- org.fantom.concurrent;bundle-version="1.0.69",
- org.fantom.gfx;bundle-version="1.0.69"
+ org.fantom.sys;bundle-version="1.0.71",
+ org.fantom.concurrent;bundle-version="1.0.71",
+ org.fantom.gfx;bundle-version="1.0.71"
 Export-Package: org.fantom.fwt.util
 Bundle-Vendor: Xored software, Inc.
diff --git a/org.fantom.fwt/fwt.pod b/org.fantom.fwt/fwt.pod
diff --git a/org.fantom.fwt/pom.xml b/org.fantom.fwt/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.fantom</groupId>
   <artifactId>org.fantom.fwt</artifactId>
-  <version>1.0.69-SNAPSHOT</version>
+  <version>1.0.71-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.fantom.fwt/source/fan/RichText.fan b/org.fantom.fwt/source/fan/RichText.fan
@@ -142,6 +142,18 @@ class RichText : TextWidget
     set { model.text = it }
   }
 
+  **
+  ** The current foreground color for text.
+  ** Defaults to null (system default)
+  **
+  native Color? fg
+
+  **
+  ** The current background color of text field
+  ** Defaults to null (system default)
+  **
+  native Color? bg
+
 //////////////////////////////////////////////////////////////////////////
 // Utils
 //////////////////////////////////////////////////////////////////////////

diff --git a/org.fantom.fwt/source/java/Fwt.java b/org.fantom.fwt/source/java/Fwt.java
@@ -68,6 +68,8 @@ private Fwt() {}
 // Display
 //////////////////////////////////////////////////////////////////////////
 
+  public Display display() { return display; }
+
   public void mainEventLoop(Shell shell)
   {
     eventLoop(shell);
@@ -269,6 +271,11 @@ public void disposeAllCursors()
 // Images
 //////////////////////////////////////////////////////////////////////////
 
+  /**
+   * Access to images cache
+   */
+  public HashMap images() { return images; }
+
   /**
    * Map a Fan Image to an SWT Image.
    */

diff --git a/org.fantom.fwt/source/java/RichTextPeer.java b/org.fantom.fwt/source/java/RichTextPeer.java
@@ -162,6 +162,23 @@ public void run()
     public void set(Widget w, int v) { ((StyledText)w).setTabs(v);  }
   };
 
+  public fan.gfx.Color fg(RichText self) { return fg.get(); }
+  public void fg(RichText self, fan.gfx.Color v) { fg.set(v); }
+  public final Prop.ColorProp fg = new Prop.ColorProp(this)
+  {
+    public void set(Widget w, org.eclipse.swt.graphics.Color v) { ((StyledText)w).setForeground(v); }
+  };
+
+  public fan.gfx.Color bg(RichText self) { return bg.get(); }
+  public void bg(RichText self, fan.gfx.Color v) { bg.set(v); }
+  public final Prop.ColorProp bg = new Prop.ColorProp(this)
+  {
+    public void set(Widget w, org.eclipse.swt.graphics.Color v) {
+      ((StyledText)w).setBackground(v);
+      ((StyledText)w).setMarginColor(v);
+    }
+  };
+
 //////////////////////////////////////////////////////////////////////////
 // Selection
 //////////////////////////////////////////////////////////////////////////

diff --git a/org.fantom.fwt/source/js/MenuItemPeer.js b/org.fantom.fwt/source/js/MenuItemPeer.js
@@ -12,37 +12,7 @@
 fan.fwt.MenuItemPeer = fan.sys.Obj.$extend(fan.fwt.WidgetPeer);
 fan.fwt.MenuItemPeer.prototype.$ctor = function(self) {}
 
-// CSS
-fan.fwt.WidgetPeer.addCss(
-  "div._fwt_MenuItem_ {" +
-  " font:" + fan.fwt.WidgetPeer.fontToCss(fan.fwt.DesktopPeer.$sysFont) + ";" +
-  " padding: 2px 12px 0px 12px;" +
-  " white-space: nowrap;" +
-  " -webkit-box-sizing: border-box;" +
-  "    -moz-box-sizing: border-box;" +
-  "         box-sizing: border-box;" +
-  "}" +
-  "div._fwt_MenuItem_ img {" +
-  "  padding: 2px 4px 3px 0;" +
-  "  vertical-align: middle;" +
-  "}" +
-  "div._fwt_MenuItem_.sep {" +
-  " margin: 6px 0 0 0;" +
-  " padding: 0 0 6px 0;" +
-  " border-top: 1px solid #dadada;" +
-  "}" +
-  "div._fwt_MenuItem_.disabled {" +
-  " color: #999;" +
-  "}" +
-  "div._fwt_MenuItem_:hover," +
-  "div._fwt_MenuItem_:focus {" +
-  " background: #3d80df;" +
-  " color: #fff;" +
-  "}" +
-  "div._fwt_MenuItem_.disabled:hover {" +
-  " background: none;" +
-  " color: #999;" +
-  "}");
+// see init.js for CSS
 
 fan.fwt.MenuItemPeer.prototype.selected   = function(self) { return this.m_selected; }
 fan.fwt.MenuItemPeer.prototype.selected$  = function(self, val) { this.m_selected = val; }

diff --git a/org.fantom.fwt/source/js/TabPanePeer.js b/org.fantom.fwt/source/js/TabPanePeer.js
@@ -9,7 +9,7 @@
 /**
  * TabPanePeer.
  */
-fan.fwt.TabPanePeer = fan.sys.Obj.$extend(fan.fwt.PanePeer);
+fan.fwt.TabPanePeer = fan.sys.Obj.$extend(fan.fwt.WidgetPeer);
 fan.fwt.TabPanePeer.prototype.$ctor = function(self) {}
 
 fan.fwt.TabPanePeer.prototype.selectedIndex = function(self) { return this.m_selectedIndex; }

diff --git a/org.fantom.fwt/source/js/TablePeer.js b/org.fantom.fwt/source/js/TablePeer.js
@@ -10,6 +10,7 @@
 // TableModel extensions
 //
 //  fan.fwt.TableModel.prototype.$uri = function(col,row) { return null; }
+//  fan.fwt.TableModel.prototype.$uriTarget = function(col,row) { return null; }
 //  fan.fwt.TableModel.prototype.$onMouseDown = function(col,row) {}
 //
 
@@ -336,6 +337,11 @@ fan.fwt.TablePeer.prototype.rebuild = function(self)
       {
         var a = document.createElement("a");
         a.href = uri.encode();
+
+        var target = null;
+        if (model.$uriTarget) target = model.$uriTarget(view.m_cols.get(c), view.m_rows.get(r));
+        if (target != null) a.target = target;
+
         node.appendChild(a);
         node = a;
       }

diff --git a/org.fantom.fwt/source/js/init.js b/org.fantom.fwt/source/js/init.js
@@ -18,6 +18,40 @@ fan.concurrent.Actor.locals().set("gfx.env", fan.fwt.FwtEnv.make());
 fan.fwt.DesktopPeer.clipboard  = function() { return fan.fwt.DesktopPeer.$clipboard; }
 fan.fwt.DesktopPeer.$clipboard = new fan.fwt.Clipboard();
 
+//
+// fwt::MenuItem CSS
+//
+fan.fwt.WidgetPeer.addCss(
+  "div._fwt_MenuItem_ {" +
+  " font:" + fan.fwt.WidgetPeer.fontToCss(fan.fwt.DesktopPeer.sysFont()) + ";" +
+  " padding: 2px 12px 0px 12px;" +
+  " white-space: nowrap;" +
+  " -webkit-box-sizing: border-box;" +
+  "    -moz-box-sizing: border-box;" +
+  "         box-sizing: border-box;" +
+  "}" +
+  "div._fwt_MenuItem_ img {" +
+  "  padding: 2px 4px 3px 0;" +
+  "  vertical-align: middle;" +
+  "}" +
+  "div._fwt_MenuItem_.sep {" +
+  " margin: 6px 0 0 0;" +
+  " padding: 0 0 6px 0;" +
+  " border-top: 1px solid #dadada;" +
+  "}" +
+  "div._fwt_MenuItem_.disabled {" +
+  " color: #999;" +
+  "}" +
+  "div._fwt_MenuItem_:hover," +
+  "div._fwt_MenuItem_:focus {" +
+  " background: #3d80df;" +
+  " color: #fff;" +
+  "}" +
+  "div._fwt_MenuItem_.disabled:hover {" +
+  " background: none;" +
+  " color: #999;" +
+  "}");
+
 //
 // fwt::Combo CSS
 //
@@ -64,7 +98,7 @@ fan.fwt.WidgetPeer.addCss(
   " height: 19px;" +
   " padding: 5px 6px 4px 6px;" +
   " color: #fff;" +
-  " font: " + fan.fwt.WidgetPeer.fontToCss(fan.fwt.DesktopPeer.$sysFont) + ";" +
+  " font: " + fan.fwt.WidgetPeer.fontToCss(fan.fwt.DesktopPeer.sysFont()) + ";" +
   // " textShadow: 0 -1px 1px #1c1c1c;" +
   " text-align: center;" +
   " border-bottom: 1px solid #282828;" +

diff --git a/org.fantom.gfx/META-INF/MANIFEST.MF b/org.fantom.gfx/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fantom core pod Gfx
 Bundle-SymbolicName: org.fantom.gfx;singleton:=true
-Bundle-Version: 1.0.69.qualifier
+Bundle-Version: 1.0.71.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.fantom.sys;bundle-version="1.0.69",
- org.fantom.concurrent;bundle-version="1.0.69"
+Require-Bundle: org.fantom.sys;bundle-version="1.0.71",
+ org.fantom.concurrent;bundle-version="1.0.71"
 Bundle-Vendor: Xored software, Inc.
diff --git a/org.fantom.gfx/gfx.pod b/org.fantom.gfx/gfx.pod