Author: tchemit Date: 2011-04-12 00:34:09 +0200 (Tue, 12 Apr 2011) New Revision: 3 Url: http://chorem.org/repositories/revision/vradi/3 Log: begin of optimize jaxx imports Modified: trunk/vradi-swing/pom.xml trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminNavUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminClientUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminGroupUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminUserUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminXmlStreamUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/RequestListUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/StatusEditionUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/XmlStreamConfigUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/popups/ThesaurusConfirmDialogUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/popups/ThesaurusEditUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/EmailPopupUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/FormViewUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/SendingViewUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/SessionViewUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/login/RegisterUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/CriteriaField.jaxx Modified: trunk/vradi-swing/pom.xml =================================================================== --- trunk/vradi-swing/pom.xml 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/pom.xml 2011-04-11 22:34:09 UTC (rev 3) @@ -32,8 +32,6 @@ <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> <jaxx.extraImportList> - org.chorem.vradi.entities.*, - org.chorem.vradi.VradiContext, org.chorem.vradi.ui.helpers.UIHelper, jaxx.runtime.swing.editor.*, javax.swing.*, Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminNavUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminNavUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminNavUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -33,21 +33,25 @@ javax.swing.tree.TreePath javax.swing.tree.TreeSelectionModel javax.swing.tree.TreeNode + javax.swing.tree.TreeModel + + jaxx.runtime.JAXXContext + jaxx.runtime.decorator.DecoratorProvider jaxx.runtime.swing.CardLayout2 - jaxx.runtime.JAXXContext - org.chorem.vradi.ui.admin.helpers.AdminNavigationTreeHelper - javax.swing.tree.TreeModel + + org.apache.commons.lang.StringUtils + org.nuiton.widget.datatips.DataTipManager - org.apache.commons.lang.StringUtils - org.chorem.vradi.ui.tree.VradiDataProvider - org.chorem.vradi.ui.tree.VradiTreeNode - jaxx.runtime.decorator.DecoratorProvider + org.nuiton.wikitty.entities.BusinessEntity + + org.chorem.vradi.VradiContext + org.chorem.vradi.VradiHelper org.chorem.vradi.ui.admin.helpers.AdminNavigationTreeHelper - org.chorem.vradi.ui.admin.renderers.AdminCellRenderer - org.chorem.vradi.VradiHelper org.chorem.vradi.ui.admin.helpers.AdminBeanConstant - org.nuiton.wikitty.entities.BusinessEntity org.chorem.vradi.ui.admin.models.AdminTreeSelectionModel + org.chorem.vradi.ui.admin.renderers.AdminCellRenderer + org.chorem.vradi.ui.tree.VradiDataProvider + org.chorem.vradi.ui.tree.VradiTreeNode </import> <CardLayout2 id='contentLayout' useOnlyVisibleComponentDimension='true'/> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminClientUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminClientUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminClientUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -25,6 +25,22 @@ <org.chorem.vradi.ui.admin.AdminContentUI superGenericType='Client' enabled='{getBean() != null}'> + + <import> + javax.swing.BoxLayout + java.beans.PropertyChangeListener + java.beans.PropertyChangeEvent + java.text.DateFormat + java.util.Date + jaxx.runtime.swing.HidorButton + jaxx.runtime.swing.ListSelectorUI + + org.chorem.vradi.entities.Client + org.chorem.vradi.ui.tree.VradiTreeNode + org.chorem.vradi.ui.admin.helpers.AdminBeanConstant + static jaxx.runtime.SwingUtil.getStringValue + </import> + <style source='../../VradiMainUI.css'/> <!-- bean property --> @@ -41,18 +57,6 @@ <field name="name" component="clientName"/> </BeanValidator> - <import> - javax.swing.BoxLayout - java.beans.PropertyChangeListener - java.beans.PropertyChangeEvent - java.text.DateFormat - java.util.Date - jaxx.runtime.swing.HidorButton - jaxx.runtime.swing.ListSelectorUI - static jaxx.runtime.SwingUtil.getStringValue - org.chorem.vradi.ui.tree.VradiTreeNode - org.chorem.vradi.ui.admin.helpers.AdminBeanConstant - </import> <script><![CDATA[ void $afterCompleteSetup() { Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminGroupUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminGroupUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminGroupUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -37,14 +37,17 @@ javax.swing.BoxLayout - org.chorem.vradi.entities.User - org.chorem.vradi.services.VradiService - jaxx.runtime.swing.HidorButton jaxx.runtime.swing.ListSelectorUI static jaxx.runtime.SwingUtil.getStringValue + + org.jdesktop.swingx.autocomplete.AutoCompleteDecorator + org.chorem.vradi.VradiConstants - org.jdesktop.swingx.autocomplete.AutoCompleteDecorator + org.chorem.vradi.VradiContext + org.chorem.vradi.entities.Group + org.chorem.vradi.entities.User + org.chorem.vradi.services.VradiService org.chorem.vradi.ui.renderers.EntityRenderer org.chorem.vradi.ui.helpers.VradiComparators org.chorem.vradi.ui.admin.widget.UserListSelectorHandler Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminUserUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminUserUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminUserUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -30,31 +30,35 @@ <import> java.beans.PropertyChangeListener java.beans.PropertyChangeEvent + java.text.DateFormat + + java.util.Collections java.util.Date + java.util.Map + java.util.HashMap + + javax.swing.BoxLayout + org.jdesktop.swingx.JXDatePicker jaxx.runtime.swing.HidorButton jaxx.runtime.swing.ListSelectorUI static jaxx.runtime.SwingUtil.getStringValue - org.chorem.vradi.ui.tree.VradiTreeNode - org.chorem.vradi.ui.admin.helpers.AdminBeanConstant org.jdesktop.swingx.autocomplete.AutoCompleteDecorator + org.chorem.vradi.VradiContext org.chorem.vradi.entities.Group - - org.chorem.vradi.ui.renderers.EntityRenderer + org.chorem.vradi.entities.User org.chorem.vradi.services.VradiException org.chorem.vradi.services.VradiService + org.chorem.vradi.ui.admin.helpers.AdminBeanConstant org.chorem.vradi.ui.admin.helpers.AdminNavigationTreeHelper org.chorem.vradi.ui.admin.widget.GroupListSelectorHandler + org.chorem.vradi.ui.renderers.EntityRenderer + org.chorem.vradi.ui.tree.VradiTreeNode - java.util.Collections - java.util.Map - java.util.HashMap - - javax.swing.BoxLayout </import> <!-- bean property --> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminXmlStreamUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminXmlStreamUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminXmlStreamUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -29,40 +29,44 @@ <style source='../../VradiMainUI.css'/> <import> + java.awt.CardLayout java.awt.Component java.io.IOException + java.text.DateFormat + java.util.Date javax.swing.BoxLayout javax.swing.JOptionPane javax.swing.DefaultComboBoxModel javax.swing.JTable javax.swing.event.TableModelEvent + javax.swing.event.TableModelListener + javax.swing.table.DefaultTableCellRenderer + javax.swing.table.TableCellRenderer + javax.swing.table.TableCellRenderer - org.chorem.vradi.entities.VradiUser - org.chorem.vradi.entities.WebHarvestStream + jaxx.runtime.SwingUtil + + org.jdesktop.swingx.decorator.Highlighter + org.jdesktop.swingx.decorator.HighlighterFactory + org.jdesktop.swingx.JXTable + + org.nuiton.wikitty.entities.WikittyExtension + + org.chorem.vradi.VradiContext org.chorem.vradi.entities.Infogene org.chorem.vradi.entities.Form org.chorem.vradi.entities.ModificationTag - - org.nuiton.wikitty.entities.WikittyExtension + org.chorem.vradi.entities.VradiUser + org.chorem.vradi.entities.WebHarvestStream + org.chorem.vradi.entities.XmlStream + org.chorem.vradi.services.VradiService + org.chorem.vradi.ui.admin.AdminPopupUI + org.chorem.vradi.ui.admin.models.XmlStreamFieldTableModel + org.chorem.vradi.ui.admin.renderers.JListCellRenderer org.chorem.vradi.ui.offer.editors.JListCellEditor - org.chorem.vradi.ui.admin.renderers.JListCellRenderer org.chorem.vradi.ui.task.ProgressBarUI - org.chorem.vradi.ui.admin.AdminPopupUI - org.chorem.vradi.ui.admin.models.XmlStreamFieldTableModel - jaxx.runtime.SwingUtil - java.text.DateFormat - java.util.Date - org.jdesktop.swingx.decorator.Highlighter - org.jdesktop.swingx.decorator.HighlighterFactory - org.jdesktop.swingx.JXTable - javax.swing.table.DefaultTableCellRenderer - javax.swing.table.TableCellRenderer - javax.swing.table.TableCellRenderer - java.awt.CardLayout - javax.swing.event.TableModelListener - org.chorem.vradi.services.VradiService </import> <!-- bean property --> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/RequestListUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/RequestListUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/RequestListUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -32,6 +32,8 @@ java.beans.PropertyChangeEvent java.io.IOException javax.swing.BoxLayout + + org.chorem.vradi.entities.Group org.chorem.vradi.beans.QueryBean org.chorem.vradi.ui.admin.AdminHandler </import> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/StatusEditionUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/StatusEditionUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/StatusEditionUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -27,14 +27,18 @@ <import> java.awt.Color + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener + javax.swing.JPanel javax.swing.JOptionPane jaxx.runtime.validator.swing.SwingValidatorMessageTableModel + + org.chorem.vradi.VradiContext + org.chorem.vradi.VradiHelper + org.chorem.vradi.entities.Status org.chorem.vradi.ui.admin.AdminHandler - org.chorem.vradi.VradiHelper - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener </import> <style source='../../VradiMainUI.css'/> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/XmlStreamConfigUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/XmlStreamConfigUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/XmlStreamConfigUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -24,22 +24,23 @@ --> <JPanel id='xmlStreamConfigUI'> - <XmlStream id='bean' javaBean='null'/> - - <style source='../../VradiMainUI.css'/> - <import> java.beans.PropertyChangeListener java.beans.PropertyChangeEvent java.util.regex.Matcher javax.swing.ComboBoxModel javax.swing.DefaultComboBoxModel + org.chorem.vradi.entities.XmlStream org.chorem.vradi.services.VradiService org.chorem.vradi.services.VradiStorageService org.chorem.vradi.ui.admin.AdminHandler org.chorem.vradi.VradiConstants </import> + <style source='../../VradiMainUI.css'/> + + <XmlStream id='bean' javaBean='null'/> + <script><![CDATA[ protected ComboBoxModel minutesModel = new DefaultComboBoxModel(new Object[]{15, 30, 45}); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/popups/ThesaurusConfirmDialogUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/popups/ThesaurusConfirmDialogUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/popups/ThesaurusConfirmDialogUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -28,6 +28,9 @@ <import> javax.swing.UIManager + + org.chorem.vradi.VradiContext + org.chorem.vradi.entities.Thesaurus org.chorem.vradi.ui.admin.content.AdminThesaurusHandler </import> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/popups/ThesaurusEditUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/popups/ThesaurusEditUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/popups/ThesaurusEditUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -31,8 +31,11 @@ static jaxx.runtime.SwingUtil.getStringValue java.beans.PropertyChangeEvent java.beans.PropertyChangeListener + jaxx.runtime.swing.editor.NumberEditor + + org.chorem.vradi.VradiContext + org.chorem.vradi.entities.Thesaurus org.chorem.vradi.ui.thesaurus.helpers.ThesaurusTreeTableHelper - jaxx.runtime.swing.editor.NumberEditor org.chorem.vradi.ui.admin.content.AdminThesaurusHandler org.chorem.vradi.ui.thesaurus.helpers.ThesaurusDataHelper </import> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/EmailPopupUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/EmailPopupUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/EmailPopupUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -35,19 +35,22 @@ javax.swing.JDialog javax.swing.event.TreeSelectionListener javax.swing.event.TreeSelectionEvent - - org.chorem.vradi.ui.email.helpers.EmailNavigationTreeHelper - org.jdesktop.swingx.JXDatePicker javax.swing.tree.TreeModel javax.swing.tree.TreePath + javax.swing.tree.TreeSelectionModel + org.jdesktop.swingx.JXDatePicker + + jaxx.runtime.decorator.DecoratorProvider + + org.chorem.vradi.VradiConstants + org.chorem.vradi.VradiContext org.chorem.vradi.entities.Session + org.chorem.vradi.ui.email.helpers.EmailNavigationTreeHelper + org.chorem.vradi.ui.email.renderers.EmailCellRenderer org.chorem.vradi.ui.tree.VradiDataProvider org.chorem.vradi.ui.tree.VradiTreeNode - org.chorem.vradi.ui.email.renderers.EmailCellRenderer - jaxx.runtime.decorator.DecoratorProvider - org.chorem.vradi.VradiConstants - javax.swing.tree.TreeSelectionModel + static org.chorem.vradi.VradiConstants.SessionStatus </import> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/FormViewUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/FormViewUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/FormViewUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -25,19 +25,26 @@ <EmailContentUI> <import> + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener + + org.jdesktop.swingx.JXDatePicker + org.chorem.vradi.entities.Group + org.chorem.vradi.entities.Thesaurus + org.chorem.vradi.entities.Session + org.chorem.vradi.entities.Form org.chorem.vradi.entities.User + + org.chorem.vradi.ui.email.helpers.EmailDataHelper + org.chorem.vradi.ui.email.models.GroupEmailEntityModel + org.chorem.vradi.ui.email.models.UserEmailEntityModel + org.chorem.vradi.ui.email.renderers.EmailFormsListCellRenderer org.chorem.vradi.ui.offer.OfferListColumnFactory org.chorem.vradi.ui.offer.OfferTable org.chorem.vradi.ui.tree.VradiTreeNode - org.jdesktop.swingx.JXDatePicker - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener - org.chorem.vradi.ui.email.helpers.EmailDataHelper + static org.chorem.vradi.VradiConstants.SessionStatus - org.chorem.vradi.ui.email.models.GroupEmailEntityModel - org.chorem.vradi.ui.email.models.UserEmailEntityModel - org.chorem.vradi.ui.email.renderers.EmailFormsListCellRenderer </import> <Session id='session' javaBean='null'/> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/SendingViewUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/SendingViewUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/SendingViewUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -26,7 +26,11 @@ <import> org.chorem.vradi.VradiContext + + org.chorem.vradi.entities.Sending + org.chorem.vradi.entities.Session org.chorem.vradi.entities.User + org.chorem.vradi.beans.FormPagedResult org.chorem.vradi.ui.offer.OfferListColumnFactory org.chorem.vradi.ui.offer.OfferTable Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/SessionViewUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/SessionViewUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/SessionViewUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -26,10 +26,11 @@ <import> java.io.File + javax.swing.table.DefaultTableCellRenderer + org.chorem.vradi.entities.Session org.chorem.vradi.ui.email.helpers.EmailNavigationTreeHelper org.chorem.vradi.ui.widgets.MultipleSelectionPane - javax.swing.table.DefaultTableCellRenderer org.chorem.vradi.ui.tree.VradiTreeNode org.chorem.vradi.services.VradiService org.chorem.vradi.ui.email.widgets.AttachmentSessionFileHandler Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/login/RegisterUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/login/RegisterUI.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/login/RegisterUI.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -30,6 +30,7 @@ onWindowClosing='dispose();'> <import> + org.chorem.vradi.entities.VradiUser org.chorem.vradi.entities.VradiUserImpl jaxx.runtime.validator.swing.SwingValidatorMessageTableModel </import> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/CriteriaField.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/CriteriaField.jaxx 2011-04-11 21:58:18 UTC (rev 2) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/CriteriaField.jaxx 2011-04-11 22:34:09 UTC (rev 3) @@ -34,6 +34,10 @@ javax.swing.JMenuItem jaxx.runtime.swing.Item + + org.chorem.vradi.VradiContext + org.chorem.vradi.entities.RootThesaurus + org.chorem.vradi.entities.Thesaurus </import> <String id='labelName' javaBean='""'/>