From: <de...@us...> - 2008-10-30 17:45:07
|
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. |