[Fudaa-svn-commit] SF.net SVN: fudaa:[9110] trunk/framework

[<bma...@us...>]

Revision: 9110
          http://sourceforge.net/p/fudaa/svn/9110
Author:   bmarchan
Date:     2015-04-17 13:48:00 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
Ajout L&F Nimbus

Modified Paths:
--------------
    trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java
    trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaLookPreferencesPanel.java

Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java	2015-04-16 15:30:15 UTC (rev 9109)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java	2015-04-17 13:48:00 UTC (rev 9110)
@@ -148,6 +148,8 @@
       } finally {
         BuLib.forgetLnf();
       }
+    } else if (lnfname.equals("ASPECT_NIMBUS")) {
+      lnfclass = "javax.swing.plaf.nimbus.NimbusLookAndFeel";
     } else if (lnfname.equals("ASPECT_METOUIA")) {
       lnfclass = "net.sourceforge.mlf.metouia.MetouiaLookAndFeel";
     } else if (lnfname.equals("ASPECT_MOTIF")) {

Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaLookPreferencesPanel.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaLookPreferencesPanel.java	2015-04-16 15:30:15 UTC (rev 9109)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaLookPreferencesPanel.java	2015-04-17 13:48:00 UTC (rev 9110)
@@ -44,7 +44,7 @@
   BuGridLayout loGen_;
   BuGridLayout loGenDesk_;
   BuPreferences options_;
-  Map optionsStr_;
+  Map<Object,Object> optionsStr_;
   BuPanel pnGenDesk_;
   BuTextField tfGenAspSkinlf_, tfGenAspOyoaha_;
 
@@ -58,7 +58,7 @@
     appli_ = _appli;
     options_ = BuPreferences.BU;
     cbRenderer_ = new BuOptionRenderer();
-    optionsStr_ = new HashMap();
+    optionsStr_ = new HashMap<Object, Object>();
     final String aspectStr = "aspect";
     optionsStr_.put("DESKTOP_UNIFORME", new BuOptionItem(getS("Uniforme"), BuResource.BU.getMenuIcon("uniforme")));
     optionsStr_.put("DESKTOP_DEGRADE", new BuOptionItem(getS("D\xE9grad\xE9"), BuResource.BU.getMenuIcon("degrade")));
@@ -99,6 +99,8 @@
         .isEnabled("ASPECT_METAL")));
     optionsStr_.put("ASPECT_MOTIF", new BuOptionItem("Motif", BuResource.BU.getMenuIcon(aspectStr), options_
         .isEnabled("ASPECT_MOTIF")));
+    optionsStr_.put("ASPECT_NIMBUS", new BuOptionItem("Nimbus", BuResource.BU.getMenuIcon(aspectStr), options_
+        .isEnabled("ASPECT_NIMBUS")));
     optionsStr_.put("ASPECT_NEXT", new BuOptionItem("Next", BuResource.BU.getMenuIcon(aspectStr), options_
         .isEnabled("ASPECT_NEXT")));
     optionsStr_.put("ASPECT_ORGANIC", new BuOptionItem("Organic", BuResource.BU.getMenuIcon(aspectStr), options_
@@ -153,7 +155,7 @@
 
     // Aspect
     lbGenAspAspect_ = new BuLabel(getS("Aspect:"), SwingConstants.RIGHT);
-    items = new BuOptionItem[11];
+    items = new BuOptionItem[12];
     int i = 0;
     items[i++] = optionsStr_.get(getAspectDefaut());
     // items[ i++]=optionsStr_.get("ASPECT_AMIGA");
@@ -161,7 +163,6 @@
     items[i++] = optionsStr_.get("ASPECT_GTK");
     // items[ i++]=optionsStr_.get("ASPECT_KUNSTSTOFF");
     items[i++] = optionsStr_.get("ASPECT_LIQUID");
-    items[i++] = optionsStr_.get("ASPECT_SUBSTANCE");
     items[i++] = optionsStr_.get("ASPECT_MAC");
     items[i++] = optionsStr_.get("ASPECT_METAL");
     items[i++] = optionsStr_.get("ASPECT_MOTIF");
@@ -169,9 +170,11 @@
      * items[ i++]=optionsStr_.get("ASPECT_NEXT"); items[i++]=optionsStr_.get("ASPECT_ORGANIC");
      * items[i++]=optionsStr_.get("ASPECT_OYOAHA");
      */
+    items[i++] = optionsStr_.get("ASPECT_NIMBUS");
     items[i++] = optionsStr_.get("ASPECT_PLASTIC");
     items[i++] = optionsStr_.get("ASPECT_PLASTIC3D");
     items[i++] = optionsStr_.get("ASPECT_PLASTICXP");
+    items[i++] = optionsStr_.get("ASPECT_SUBSTANCE");
     /*
      * items[i++]=optionsStr_.get("ASPECT_SKINLF"); items[i++]=optionsStr_.get("ASPECT_SLAF");
      */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.