Author: tchemit Date: 2009-10-22 12:59:35 +0200 (Thu, 22 Oct 2009) New Revision: 1680 Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx Log: move context entry def static methods to jaxx.runtime.Util Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2009-10-16 17:00:52 UTC (rev 1679) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2009-10-22 10:59:35 UTC (rev 1680) @@ -23,7 +23,6 @@ import java.io.IOException; import javax.swing.SwingUtilities; -import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.SwingUtil; import jaxx.runtime.Util; import org.apache.commons.logging.Log; @@ -61,7 +60,7 @@ log.info(_("i18neditor.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); - Util.checkJAXXContextEntry(context, JAXXContextEntryDef.newDef(I18nEditorConfig.class)); + Util.checkJAXXContextEntry(context, Util.newContextEntryDef(I18nEditorConfig.class)); I18nEditorConfig config = context.getContextValue(I18nEditorConfig.class); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-16 17:00:52 UTC (rev 1679) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-22 10:59:35 UTC (rev 1680) @@ -21,6 +21,7 @@ import java.beans.PropertyChangeListener; import java.util.List; import java.util.Locale; +import jaxx.runtime.Util; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,11 +45,11 @@ //------------------------------------------- // UI instances //------------------------------------------- - public static final JAXXContextEntryDef<I18nEditorUI> MAIN_UI_ENTRY_DEF = JAXXContextEntryDef.newDef("mainui", I18nEditorUI.class); - public static final JAXXContextEntryDef<I18nProject> PROJECT_DEF = JAXXContextEntryDef.newDef(I18nProject.class); - private static final JAXXContextEntryDef<String> SELECTED_KEY_DEF = JAXXContextEntryDef.newDef("selectedKey", String.class); - private static final JAXXContextEntryDef<String> RE_SELECTED_KEY_DEF = JAXXContextEntryDef.newDef("reSelectedKey", String.class); - private static final JAXXContextEntryDef<TreeModelMode> TREE_MODEL_MODE_DEF = JAXXContextEntryDef.newDef(TreeModelMode.class); + public static final JAXXContextEntryDef<I18nEditorUI> MAIN_UI_ENTRY_DEF = Util.newContextEntryDef("mainui", I18nEditorUI.class); + public static final JAXXContextEntryDef<I18nProject> PROJECT_DEF = Util.newContextEntryDef(I18nProject.class); + private static final JAXXContextEntryDef<String> SELECTED_KEY_DEF = Util.newContextEntryDef("selectedKey", String.class); + private static final JAXXContextEntryDef<String> RE_SELECTED_KEY_DEF = Util.newContextEntryDef("reSelectedKey", String.class); + private static final JAXXContextEntryDef<TreeModelMode> TREE_MODEL_MODE_DEF = Util.newContextEntryDef(TreeModelMode.class); public static final String PROJECT_PROPERTY = "project"; public static final String SELECTED_PACKAGES_PROPERTY = "selectedPackages"; public static final String SELECTED_BUNDLES_PROPERTY = "selectedBundles"; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2009-10-16 17:00:52 UTC (rev 1679) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2009-10-22 10:59:35 UTC (rev 1680) @@ -35,7 +35,7 @@ import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.WizardOperationState; import jaxx.runtime.swing.wizard.WizardUtil; -import static jaxx.runtime.context.JAXXContextEntryDef.newDef; +import static jaxx.runtime.Util.newContextEntryDef; import static jaxx.runtime.Util.checkJAXXContextEntry; import org.nuiton.i18n.editor.I18nEditorContext; @@ -58,9 +58,9 @@ super(owner); // verification du context parent - checkJAXXContextEntry(parentContext, newDef(ProjectUIModel.class)); - checkJAXXContextEntry(parentContext, newDef("apply", Runnable.class)); - checkJAXXContextEntry(parentContext, newDef("cancel", Runnable.class)); + checkJAXXContextEntry(parentContext, newContextEntryDef(ProjectUIModel.class)); + checkJAXXContextEntry(parentContext, newContextEntryDef("apply", Runnable.class)); + checkJAXXContextEntry(parentContext, newContextEntryDef("cancel", Runnable.class)); if (owner != null) { setContextValue(owner, "parent");