fudaa-svn-commit

[Fudaa-svn-commit] SF.net SVN: fudaa:[3911] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli/visuallibrary/EbliWidgetTextEditor.java

[<de...@us...>]

Revision: 3911
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3911&view=rev
Author:   deniger
Date:     2008-09-11 22:20:32 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------


Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java	2008-09-11 22:14:11 UTC (rev 3910)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java	2008-09-11 22:20:32 UTC (rev 3911)
@@ -1,7 +1,6 @@
 package org.fudaa.ebli.visuallibrary;
 
 import java.awt.Dimension;
-import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.util.EnumSet;
 
@@ -65,25 +64,25 @@
    *          de l editeur html
    * @param g
    */
-   public void decoupeEcriture(String text, Graphics2D g) {
-     
-     int espaceLignes = 10;
-     
-     if(text==null || text.length()==0)
-       return;
-     
-     Rectangle rec = getClientArea();
-     int indiceDep=0;
-     int espaceAffichable = Math.min((int) (rec.width / 5), text.length());
-     
-     for (int i = 0; indiceDep + espaceAffichable < text.length(); i++) {
-     g.drawString(text.substring(indiceDep, indiceDep + espaceAffichable), rec.x, rec.y + i * espaceLignes);
-      indiceDep = indiceDep + espaceAffichable;
-     
-     }
-     
-    
-  }
+//   public void decoupeEcriture(String text, Graphics2D g) {
+//     
+//     int espaceLignes = 10;
+//     
+//     if(text==null || text.length()==0)
+//       return;
+//     
+//     Rectangle rec = getClientArea();
+//     int indiceDep=0;
+//     int espaceAffichable = Math.min((int) (rec.width / 5), text.length());
+//     
+//     for (int i = 0; indiceDep + espaceAffichable < text.length(); i++) {
+//     g.drawString(text.substring(indiceDep, indiceDep + espaceAffichable), rec.x, rec.y + i * espaceLignes);
+//      indiceDep = indiceDep + espaceAffichable;
+//     
+//     }
+//     
+//    
+//  }
    
    
   public BuPanel createEditorComponent(


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

[Fudaa-svn-commit] SF.net SVN: fudaa:[4130] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli/visuallibrary/EbliWidgetTextEditor.java

[<de...@us...>]

Revision: 4130
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4130&view=rev
Author:   deniger
Date:     2008-10-30 17:45:01 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------


Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java	2008-10-30 17:44:47 UTC (rev 4129)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java	2008-10-30 17:45:01 UTC (rev 4130)
@@ -5,6 +5,7 @@
 
 import javax.swing.JLabel;
 
+import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.gui.CtuluHtmlEditorPanel;
 import org.netbeans.api.visual.action.ActionFactory;
 import org.netbeans.api.visual.action.InplaceEditorProvider;
@@ -22,18 +23,16 @@
   // ComponentWidget widget;
   BuPanel conteneur = null;
   // LabelWidget intern_;
-  ComponentWidget intern_;
+  EbliHtmlWidget intern_;
 
-  JLabel contenuHTML_ = new JLabel();
-
   public EbliWidgetTextEditor(final EbliScene scene, final CtuluHtmlEditorPanel content) {
     super(scene, false);
     editorPane_ = content;
-    
-   intern_ = new ComponentWidget(scene, contenuHTML_);
-   // intern_ = new ComponentWidget(scene, editorPane_.);
 
-    contenuHTML_.setText(content.getDocumentText());
+    intern_ = new EbliHtmlWidget(scene, content.getDocumentText());
+    // intern_ = new ComponentWidget(scene, editorPane_.);
+
+    // contenuHTML_.setText(content.getDocumentText());
     // -- ajout en interne du label d affichage --//
     this.addChild(intern_);
 
@@ -100,7 +99,7 @@
 
     }
     // -- on masque l affichage du widgetcomponent --//
-   // contenuHTML_.setText("");
+    // contenuHTML_.setText("");
 
     return editorPane_;
 
@@ -134,9 +133,9 @@
   //
   // }
 
-  public void notifyClosing(final EditorController _controller, final Widget _widget, final CtuluHtmlEditorPanel _editor,
-      final boolean _commit) {
-     contenuHTML_.setText(editorPane_.getDocumentText());
+  public void notifyClosing(final EditorController _controller, final Widget _widget,
+      final CtuluHtmlEditorPanel _editor, final boolean _commit) {
+    intern_.setHtml(editorPane_.getDocumentText());
     intern_.repaint();
     intern_.revalidate();
     this.repaint();
@@ -146,12 +145,12 @@
   }
 
   public void notifyOpened(final EditorController _controller, final Widget _widget, final CtuluHtmlEditorPanel _editor) {
-     //contenuHTML_.setText(CtuluHtmlEditorPanel.showMinimalHtmlDialog(contenuHTML_.getText(),
-     //getEbliScene().getView(), true));
-	  //editorPane_.setDocumentText(contenuHTML_.getText());
-	  // -- on masque l affichage du widgetcomponent --//
-	    contenuHTML_.setText("");
-	  editingStart();
+    // contenuHTML_.setText(CtuluHtmlEditorPanel.showMinimalHtmlDialog(contenuHTML_.getText(),
+    // getEbliScene().getView(), true));
+    // editorPane_.setDocumentText(contenuHTML_.getText());
+    // -- on masque l affichage du widgetcomponent --//
+    intern_.setHtml(CtuluLibString.EMPTY_STRING);
+    editingStart();
 
   }
 


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

[Fudaa-svn-commit] SF.net SVN: fudaa:[4131] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli/visuallibrary/EbliWidgetTextEditor.java

[<de...@us...>]

Revision: 4131
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4131&view=rev
Author:   deniger
Date:     2008-10-30 19:41:41 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------


Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java	2008-10-30 17:45:01 UTC (rev 4130)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java	2008-10-30 19:41:41 UTC (rev 4131)
@@ -1,16 +1,18 @@
 package org.fudaa.ebli.visuallibrary;
 
+import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.util.EnumSet;
 
 import javax.swing.JLabel;
+import javax.swing.plaf.basic.BasicHTML;
+import javax.swing.text.View;
 
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.gui.CtuluHtmlEditorPanel;
 import org.netbeans.api.visual.action.ActionFactory;
 import org.netbeans.api.visual.action.InplaceEditorProvider;
 import org.netbeans.api.visual.action.WidgetAction;
-import org.netbeans.api.visual.widget.ComponentWidget;
 import org.netbeans.api.visual.widget.Widget;
 
 import com.memoire.bu.BuBorderLayout;
@@ -22,19 +24,23 @@
   CtuluHtmlEditorPanel editorPane_ = new CtuluHtmlEditorPanel();
   // ComponentWidget widget;
   BuPanel conteneur = null;
+
   // LabelWidget intern_;
-  EbliHtmlWidget intern_;
+  // EbliHtmlWidget intern_;
 
   public EbliWidgetTextEditor(final EbliScene scene, final CtuluHtmlEditorPanel content) {
     super(scene, false);
+
+    super.setCheckClipping(true);
     editorPane_ = content;
+    view = BasicHTML.createHTMLView(content, content.getDocumentText());
 
-    intern_ = new EbliHtmlWidget(scene, content.getDocumentText());
+    // intern_ = new EbliHtmlWidget(scene, content.getDocumentText());
     // intern_ = new ComponentWidget(scene, editorPane_.);
 
     // contenuHTML_.setText(content.getDocumentText());
     // -- ajout en interne du label d affichage --//
-    this.addChild(intern_);
+    // this.addChild(intern_);
 
     // -- creation de l action pour editor --//
     final WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
@@ -45,9 +51,36 @@
     final EbliWidgetControllerTextEditor controller = new EbliWidgetControllerTextEditor(this);
     controller.setEditable(true);
     setController(controller);
+  }
 
+  View view;
+
+  // JLabel c = new JLabel();
+
+  public void setHtml(String html) {
+    view = BasicHTML.createHTMLView(editorPane_, html);
   }
 
+  @Override
+  protected Rectangle calculateClientArea() {
+    Rectangle rec = new Rectangle();
+    // the preferred size is here
+    rec.height = (int) view.getPreferredSpan(View.Y_AXIS);
+    rec.width = (int) view.getPreferredSpan(View.X_AXIS);
+    return rec;
+  }
+
+  /**
+   *
+   */
+  @Override
+  protected void paintWidget() {
+    Rectangle clientArea = getClientArea();
+    // System.err.println(clientArea);
+    // c.setPreferredSize(new Dimension(clientArea.width, clientArea.height));
+    view.paint(getGraphics(), clientArea);
+  }
+
   // protected void paintWidget() {
   // Graphics2D g = getGraphics();
   //
@@ -87,7 +120,7 @@
     if (conteneur == null) {
       conteneur = new BuPanel(new BuBorderLayout());
 
-      final Rectangle rec = getClientArea();
+      // final Rectangle rec = getClientArea();
       // editorPane_.setSize(rec.width, rec.height);
       // editorPane_.setPreferredSize(new Dimension(rec.width, rec.height));
       // conteneur.setPreferredSize(new Dimension(rec.width, rec.height));
@@ -135,9 +168,9 @@
 
   public void notifyClosing(final EditorController _controller, final Widget _widget,
       final CtuluHtmlEditorPanel _editor, final boolean _commit) {
-    intern_.setHtml(editorPane_.getDocumentText());
-    intern_.repaint();
-    intern_.revalidate();
+    setHtml(editorPane_.getDocumentText());
+    // intern_.repaint();
+    // intern_.revalidate();
     this.repaint();
     getEbliScene().refresh();
     editingStop();
@@ -149,7 +182,7 @@
     // getEbliScene().getView(), true));
     // editorPane_.setDocumentText(contenuHTML_.getText());
     // -- on masque l affichage du widgetcomponent --//
-    intern_.setHtml(CtuluLibString.EMPTY_STRING);
+    setHtml(CtuluLibString.EMPTY_STRING);
     editingStart();
 
   }


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