[Buix-commits] r405 - in trunk/lutinvcs: lutinvcs-ui/src/main/java/org/codelutin/vcs/ui lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui

6 Apr 2008

Author: tchemit
Date: 2008-04-06 13:47:28 +0000 (Sun, 06 Apr 2008)
New Revision: 405

Added:
   trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java
Modified:
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx
   trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java
   trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java
   trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java
   trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java
   trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java
   trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java
Log:
new module : ui-pre-jaxx

Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java
===================================================================

--- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java	2008-04-06 13:47:28 UTC (rev 405)
@@ -23,7 +23,7 @@
 /** @author chemit */
 public class ConfirmUIHandler extends AbstractConfirmUIHandler {
 
-    protected final JConfirmUI ui;
+    protected final AbstractConfirmUI ui;
 
     public ConfirmUIHandler() {
         this.ui = new JConfirmUI(this);
@@ -33,7 +33,7 @@
         return ui.getModel();
     }
 
-    public JConfirmUI getUi() {
+    public AbstractConfirmUI getUi() {
         return ui;
     }
 

Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java
===================================================================
--- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java	2008-04-06 13:47:28 UTC (rev 405)
@@ -51,7 +51,7 @@
                 return;
             }
             log.info("files to treate :" + entries.size());
-            JConfirmUI confirmUI = VCSUIFactory.newConfirmUI();
+            AbstractConfirmUI confirmUI = VCSUIFactory.newConfirmUI();
 
             confirmUI.getModel().init(action, model.getLocation(), entries.toArray(new VCSEntry[entries.size()]));
 

Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java
===================================================================
--- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java	2008-04-06 13:47:28 UTC (rev 405)
@@ -61,7 +61,7 @@
 
         } else {
             // show confirm action ui            
-            JConfirmUI confirmUI = VCSUIFactory.newConfirmUI();
+            AbstractConfirmUI confirmUI = VCSUIFactory.newConfirmUI();
             confirmUI.getModel().init(action, tableModel.getLocation(), entries.toArray(new VCSEntry[entries.size()]));
             confirmUI.getHandler().getSelectionModel().setSelectionInterval(0, entries.size() - 1);
             confirmUI.setVisible(true);

Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java
===================================================================
--- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java	2008-04-06 13:47:28 UTC (rev 405)
@@ -30,7 +30,7 @@
 
     protected static AbstractTabUI synchUI;
     protected static AbstractDiffUI diffUI;
-    protected static JConfirmUI confirmUI;
+    protected static AbstractConfirmUI confirmUI;
 
     public static AbstractSynchUI newSynchUI() {
         SynchUIHandler result = newHandler(SynchUIHandler.class);
@@ -42,7 +42,7 @@
         return result.getUi();
     }
 
-    public static JConfirmUI newConfirmUI() {
+    public static AbstractConfirmUI newConfirmUI() {
         ConfirmUIHandler result = newHandler(ConfirmUIHandler.class);
         return result.getUi();
     }

Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx	2008-04-06 13:47:28 UTC (rev 405)
@@ -1,37 +1,21 @@
-<org.codelutin.vcs.ui.AbstractUI title='lutinvcs.confirm.title' defaultCloseOperation='DISPOSE_ON_CLOSE' modal='true'
-                                 resizable='false' height='300' width='400'>
+<AbstractConfirmUI title='lutinvcs.confirm.title' defaultCloseOperation='DISPOSE_ON_CLOSE' modal='true'
+                   resizable='false' height='300' width='400'>
     <style source="common.css"/>
     <script>
         import org.codelutin.vcs.type.VCSAction;
-        import org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler;
-        import org.codelutin.vcs.ui.model.ConfirmUIModel ;
 
-        public JConfirmUI(AbstractConfirmUIHandler handler) {
-
-        super(handler,new ConfirmUIModel());
-
-        Action acceptAction= new AbstractAction("accept") {
+        public JConfirmUI(org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler handler) {
+        super(handler,new org.codelutin.vcs.ui.model.ConfirmUIModel());
+        Action acceptAction = new AbstractAction("accept") {
         private static final long serialVersionUID = 1L;
+
         public void actionPerformed(ActionEvent e) {
-        getHandler().doAction(getCommitMessage().getText(),getModel().getModel());
+        getHandler().doAction(getCommitMessage().getText(), getModel().getModel());
         }
         };
-        accept.setAction((acceptAction));
+        getAccept().setAction((acceptAction));
         }
 
-        @Override
-        protected AbstractConfirmUIHandler getHandler() {
-        return (AbstractConfirmUIHandler) super.getHandler();
-        }
-
-        @Override
-        public ConfirmUIModel getModel() {
-        return (ConfirmUIModel) super.getModel();
-        }
-
-        protected void showLastMessages() {
-
-        }
     </script>
     <Table>
         <row fill='both'>
@@ -82,5 +66,5 @@
             </cell>
         </row>
     </Table>
-</org.codelutin.vcs.ui.AbstractUI>
+</AbstractConfirmUI>
         
\ No newline at end of file

Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx	2008-04-06 13:47:28 UTC (rev 405)
@@ -1,4 +1,4 @@
-<org.codelutin.vcs.ui.AbstractDiffUI title='lutinvcs.diff.title' id='diffui' defaultCloseOperation='DISPOSE_ON_CLOSE'>
+<AbstractDiffUI title='lutinvcs.diff.title' id='diffui' defaultCloseOperation='DISPOSE_ON_CLOSE'>
     <style source="common.css"/>
     <script>
         import org.codelutin.vcs.type.VCSAction;
@@ -76,4 +76,4 @@
             </cell>
         </row>
     </Table>
-</org.codelutin.vcs.ui.AbstractDiffUI>
+</AbstractDiffUI>

Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx	2008-04-06 13:47:28 UTC (rev 405)
@@ -1,5 +1,5 @@
-<org.codelutin.vcs.ui.AbstractSynchUI title='lutinvcs.synch.title' modal="true" id='synchui'
-                                      defaultCloseOperation='DISPOSE_ON_CLOSE'>
+<AbstractSynchUI title='lutinvcs.synch.title' modal="true" id='synchui'
+                 defaultCloseOperation='DISPOSE_ON_CLOSE'>
     <style source="common.css"/>
     <script>
         import org.codelutin.vcs.type.VCSAction;
@@ -13,14 +13,15 @@
 
     <java.awt.CardLayout id='cardLayout'/>
 
-    <!--JPopupMenu enabled='false'/-->
-    <org.codelutin.vcs.ui.JVCSPopup id="allPopup"/>
-    <org.codelutin.vcs.ui.JVCSPopup id="localPopup"/>
-    <org.codelutin.vcs.ui.JVCSPopup id="remotePopup"/>
+
     <Table id='table'>
         <row fill='both'>
             <cell fill='both' weightx='1'>
                 <JToolBar>
+                    <!--JPopupMenu enabled='false'/-->
+                    <org.codelutin.vcs.ui.JVCSPopup id="allPopup"/>
+                    <org.codelutin.vcs.ui.JVCSPopup id="localPopup"/>
+                    <org.codelutin.vcs.ui.JVCSPopup id="remotePopup"/>
                     <JToggleButton id='allTab' buttonGroup='tabs' text='lutinvcs.tabs.all' mnemonic="A"
                                    toolTipText="lutinvcs.tabs.tooltip.all"
                                    onActionPerformed='setLocation(VCSEntryLocation.ALL)'/>
@@ -72,4 +73,4 @@
             </cell>
         </row>
     </Table>
-</org.codelutin.vcs.ui.AbstractSynchUI>
\ No newline at end of file
+</AbstractSynchUI>
\ No newline at end of file

Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx	2008-04-06 13:47:28 UTC (rev 405)
@@ -1,25 +1,13 @@
-<org.codelutin.vcs.ui.AbstractVCSPopup>
+<AbstractVCSPopup>
     <script>
         import org.codelutin.vcs.type.VCSAction;
-        import org.codelutin.vcs.ui.handler.VCSAbsractAction;
 
-        protected VCSAbsractAction dispatchAction;
-
-        protected void setDispatchAction(VCSAbsractAction action) {
-        this.dispatchAction=action;
-        }
-
-        protected void doAction(VCSAction action,JMenuItem item) {
-        dispatchAction.setAction(action);
-        ActionEvent e = new ActionEvent( item,1,action.name());
-        dispatchAction.actionPerformed(e);
-        }
-        /*add(refresh);
+        add(refresh);
         add(diff);
         add(update);
         add(commit);
         add(revert);
-        add(delete);*/
+        add(delete);
     </script>
     <JMenuItem id='refresh' text='{_("lutinvcs.action.refresh")}' toolTipText='{_("lutinvcs.action.tooltip.refresh")}'
                icon='{createImageIcon("autoRefresh.png")}' onActionPerformed='doAction(VCSAction.REFRESH,refresh)'/>
@@ -33,4 +21,4 @@
                icon='{createImageIcon("rollback.png")}' onActionPerformed='doAction(VCSAction.REVERT,revert)'/>
     <JMenuItem id='delete' text='{_("lutinvcs.action.delete")}' toolTipText='{_("lutinvcs.action.tooltip.delete")}'
                icon='{createImageIcon("remove.png")}' onActionPerformed='doAction(VCSAction.DELETE,delete)'/>
-</org.codelutin.vcs.ui.AbstractVCSPopup>
\ No newline at end of file
+</AbstractVCSPopup>
\ No newline at end of file

Added: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java	                        (rev 0)
+++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java	2008-04-06 13:47:28 UTC (rev 405)
@@ -0,0 +1,73 @@
+/**
+ * # #% Copyright (C) 2008 Code Lutin, Tony Chemit 
+ * This program is free software; you
+ * can redistribute it and/or modify it under the terms of the GNU General
+ * Public License as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. This program is
+ * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details. You
+ * should have received a copy of the GNU General Public License along with this
+ * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place
+ * - Suite 330, Boston, MA 02111-1307, USA. 
+ * # #%
+ */
+package org.codelutin.vcs.ui;
+
+import jaxx.runtime.swing.Table;
+import org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler;
+import org.codelutin.vcs.ui.handler.AbstractUIHandler;
+import org.codelutin.vcs.ui.model.AbstractUIModel;
+import org.codelutin.vcs.ui.model.ConfirmUIModel;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JToolBar;
+
+/** @author chemit */
+public abstract class AbstractConfirmUI extends AbstractUI {
+
+    public abstract JLabel getActionLabel();
+
+    public abstract Table getToolbar();
+
+    public abstract JToolBar getTool();
+
+    public abstract JLabel getActionCommitLabel();
+
+    public abstract JButton getLastMessages();
+
+    public abstract JScrollPane getCommitScroll();
+
+    public abstract JTextArea getCommitMessage();
+
+    public abstract JScrollPane getContent();
+
+    public abstract JTable getContentTable();
+
+    public abstract JButton getAccept();
+
+    public AbstractConfirmUI() {
+    }
+
+    public AbstractConfirmUI(AbstractUIHandler handler, AbstractUIModel model) {
+        super(handler, model);
+    }
+
+    @Override
+    protected AbstractConfirmUIHandler getHandler() {
+        return (AbstractConfirmUIHandler) super.getHandler();
+    }
+
+    @Override
+    public ConfirmUIModel getModel() {
+        return (ConfirmUIModel) super.getModel();
+    }
+
+    protected void showLastMessages() {
+
+    }
+}

Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java	2008-04-06 13:47:28 UTC (rev 405)
@@ -22,6 +22,7 @@
 
 /** @author chemit */
 public abstract class AbstractVCSPopup extends javax.swing.JPopupMenu {/* begin raw body code */
+
     protected VCSAbsractAction dispatchAction;
 
     public abstract JMenuItem getRefresh();

Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java	2008-04-06 13:19:28 UTC (rev 404)
+++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java	2008-04-06 13:47:28 UTC (rev 405)
@@ -19,27 +19,21 @@
 import jaxx.tags.swing.JPopupMenuHandler;
 import jaxx.tags.swing.JWindowHandler;
 
-import java.beans.Introspector;
-
 public class VCSInitializer implements jaxx.spi.Initializer {
 
     public void initialize() {
-        String[] searchPath = Introspector.getBeanInfoSearchPath();
-        String[] newSearchPath = new String[searchPath.length + 1];
-        System.arraycopy(searchPath, 0, newSearchPath, 0, searchPath.length);
-        newSearchPath[newSearchPath.length - 1] = "jaxx.beaninfos";
 
-        Introspector.setBeanInfoSearchPath(newSearchPath);
-
-        //TagManager.registerTag("org.codelutin.vcs.ui.*", "JVCSPopup", new jaxx.tags.DefaultObjectHandler(ClassDescriptorLoader.getClassDescriptor(JPopupMenuHandler.class)));
-
+        //TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(AbstractUI.class), JWindowHandler.class);
         TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(AbstractVCSPopup.class), JPopupMenuHandler.class);
 
+        TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(AbstractConfirmUI.class), JWindowHandler.class);
+        TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(AbstractDiffUI.class), JWindowHandler.class);
         TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(AbstractSynchUI.class), JWindowHandler.class);
 
-        //TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(AbstractUI.class), JDialog.class);
+        TagManager.registerDefaultNamespace("AbstractConfirmUI", "org.codelutin.vcs.ui.*");
+        TagManager.registerDefaultNamespace("AbstractSynchUI", "org.codelutin.vcs.ui.*");
+        TagManager.registerDefaultNamespace("AbstractDiffUI", "org.codelutin.vcs.ui.*");
+        TagManager.registerDefaultNamespace("AbstractVCSPopup", "org.codelutin.vcs.ui.*");
 
-        //TagManager.registerDefaultNamespace("AbstractUI", "javax.swing.*");
-
     }
 }
\ No newline at end of file

    

[Buix-commits] r405 - in trunk/lutinvcs: lutinvcs-ui/src/main/java/org/codelutin/vcs/ui lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui

tchemit＠users.labs.libre-entreprise.org