From 8d66cfb4c6e065546112e03516b7c525423fa589 Mon Sep 17 00:00:00 2001 From: codistmonk Date: Mon, 5 Jul 2010 19:52:55 +0000 Subject: [PATCH] [Markups] Refactoring to make reuse easier. [SubtitlesAdjuster] Refactoring to make reuse easier. git-svn-id: https://aprog.svn.sourceforge.net/svnroot/aprog/trunk@128 7cbf5e2b-b55d-4b93-acdd-c0d7b961df51 --- .../src/net/sourceforge/aprog/markups/Markups.java | 13 +++-- .../markups/{Actions.java => MarkupsActions.java} | 33 +++++++------ .../{Components.java => MarkupsComponents.java} | 56 +++++++++++----------- .../{Constants.java => MarkupsConstants.java} | 4 +- 4 files changed, 56 insertions(+), 50 deletions(-) rename Markups/src/net/sourceforge/aprog/markups/{Actions.java => MarkupsActions.java} (84%) rename Markups/src/net/sourceforge/aprog/markups/{Components.java => MarkupsComponents.java} (90%) rename Markups/src/net/sourceforge/aprog/markups/{Constants.java => MarkupsConstants.java} (98%) diff --git a/Markups/src/net/sourceforge/aprog/markups/Markups.java b/Markups/src/net/sourceforge/aprog/markups/Markups.java index 22fc4a5..c22d693 100644 --- a/Markups/src/net/sourceforge/aprog/markups/Markups.java +++ b/Markups/src/net/sourceforge/aprog/markups/Markups.java @@ -24,13 +24,12 @@ package net.sourceforge.aprog.markups; -import static net.sourceforge.aprog.markups.Constants.Variables.*; +import static net.sourceforge.aprog.markups.MarkupsConstants.Variables.*; import static net.sourceforge.aprog.i18n.Messages.*; import static net.sourceforge.aprog.tools.Tools.*; import static net.sourceforge.aprog.swing.SwingTools.*; import net.sourceforge.aprog.context.Context; -import net.sourceforge.aprog.events.Variable; import net.sourceforge.aprog.tools.IllegalInstantiationException; import net.sourceforge.aprog.xml.XMLTools; import net.sourceforge.jmacadapter.MacAdapterTools; @@ -49,7 +48,7 @@ public final class Markups { } static { - MacAdapterTools.setApplicationName(Constants.APPLICATION_NAME); + MacAdapterTools.setApplicationName(MarkupsConstants.APPLICATION_NAME); useSystemLookAndFeel(); setMessagesBase(getThisPackagePath() + "Messages"); } @@ -59,7 +58,7 @@ public final class Markups { */ public static final void main(final String[] arguments) { if (canInvokeLaterThisMethodInAWT(null, (Object) arguments)) { - Components.newMainFrame(newContext()).setVisible(true); + MarkupsComponents.newMainFrame(newContext()).setVisible(true); } } @@ -72,9 +71,9 @@ public final class Markups { public static final Context newContext() { final Context result = new Context(); - result.set(APPLICATION_NAME, Constants.APPLICATION_NAME); - result.set(APPLICATION_VERSION, Constants.APPLICATION_VERSION); - result.set(APPLICATION_COPYRIGHT, Constants.APPLICATION_COPYRIGHT); + result.set(APPLICATION_NAME, MarkupsConstants.APPLICATION_NAME); + result.set(APPLICATION_VERSION, MarkupsConstants.APPLICATION_VERSION); + result.set(APPLICATION_COPYRIGHT, MarkupsConstants.APPLICATION_COPYRIGHT); result.set(FILE, null); result.set(FILE_MODIFIED, false); result.set(DOM, XMLTools.newDocument()); diff --git a/Markups/src/net/sourceforge/aprog/markups/Actions.java b/Markups/src/net/sourceforge/aprog/markups/MarkupsActions.java similarity index 84% rename from Markups/src/net/sourceforge/aprog/markups/Actions.java rename to Markups/src/net/sourceforge/aprog/markups/MarkupsActions.java index f27f11c..99f5f14 100644 --- a/Markups/src/net/sourceforge/aprog/markups/Actions.java +++ b/Markups/src/net/sourceforge/aprog/markups/MarkupsActions.java @@ -24,7 +24,7 @@ package net.sourceforge.aprog.markups; -import static net.sourceforge.aprog.markups.Constants.Variables.*; +import static net.sourceforge.aprog.markups.MarkupsConstants.Variables.*; import java.awt.Component; import java.io.FileNotFoundException; @@ -39,6 +39,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeModel; import net.sourceforge.aprog.context.Context; +import net.sourceforge.aprog.subtitlesadjuster.SubtitlesAdjusterActions; import net.sourceforge.aprog.tools.IllegalInstantiationException; import net.sourceforge.aprog.tools.Tools; import net.sourceforge.aprog.xml.XMLTools; @@ -50,12 +51,12 @@ import org.xml.sax.InputSource; * * @author codistmonk (creation 2010-07-03) */ -public final class Actions { +public final class MarkupsActions { /** * @throws IllegalInstantiationException To prevent instantiation */ - private Actions() { + private MarkupsActions() { throw new IllegalInstantiationException(); } @@ -123,7 +124,8 @@ public final class Actions { final JFileChooser fileChooser = new JFileChooser(); - if (JFileChooser.APPROVE_OPTION == fileChooser.showOpenDialog((Component) context.get(MAIN_FRAME)) && fileChooser.getSelectedFile() != null) { + if (JFileChooser.APPROVE_OPTION == fileChooser.showOpenDialog((Component) context.get(MAIN_FRAME)) && + fileChooser.getSelectedFile() != null) { final File file = fileChooser.getSelectedFile(); context.set(DOM, XMLTools.parse(new InputSource(file.getAbsolutePath()))); @@ -156,7 +158,8 @@ public final class Actions { public static final void saveAs(final Context context) { final JFileChooser fileChooser = new JFileChooser(); - if (JFileChooser.APPROVE_OPTION == fileChooser.showSaveDialog((Component) context.get(MAIN_FRAME)) && fileChooser.getSelectedFile() != null) { + if (JFileChooser.APPROVE_OPTION == fileChooser.showSaveDialog((Component) context.get(MAIN_FRAME)) && + fileChooser.getSelectedFile() != null) { save(context, fileChooser.getSelectedFile()); } } @@ -172,14 +175,16 @@ public final class Actions { */ private static final void save(final Context context, final File file) { try { + final TreeModel treeModel = (TreeModel) context.get(TREE_MODEL); + XMLTools.write( - (Node) ((DefaultMutableTreeNode) ((TreeModel) context.get(TREE_MODEL)).getRoot()).getUserObject(), + (Node) ((DefaultMutableTreeNode) treeModel.getRoot()).getUserObject(), new FileOutputStream(file), 0); context.set(FILE, file); context.set(FILE_MODIFIED, false); } catch (final FileNotFoundException exception) { - net.sourceforge.aprog.subtitlesadjuster.Actions.showErrorMessage(context, exception); + SubtitlesAdjusterActions.showErrorMessage(context, exception); } } @@ -191,7 +196,7 @@ public final class Actions { public static final void undo(final Context context) { Tools.debugPrint("TODO"); - net.sourceforge.aprog.subtitlesadjuster.Actions.showTODOMessage(context); + SubtitlesAdjusterActions.showTODOMessage(context); } /** @@ -202,7 +207,7 @@ public final class Actions { public static final void redo(final Context context) { Tools.debugPrint("TODO"); - net.sourceforge.aprog.subtitlesadjuster.Actions.showTODOMessage(context); + SubtitlesAdjusterActions.showTODOMessage(context); } /** @@ -213,7 +218,7 @@ public final class Actions { public static final void copy(final Context context) { Tools.debugPrint("TODO"); - net.sourceforge.aprog.subtitlesadjuster.Actions.showTODOMessage(context); + SubtitlesAdjusterActions.showTODOMessage(context); } /** @@ -224,7 +229,7 @@ public final class Actions { public static final void cut(final Context context) { Tools.debugPrint("TODO"); - net.sourceforge.aprog.subtitlesadjuster.Actions.showTODOMessage(context); + SubtitlesAdjusterActions.showTODOMessage(context); } /** @@ -235,7 +240,7 @@ public final class Actions { public static final void paste(final Context context) { Tools.debugPrint("TODO"); - net.sourceforge.aprog.subtitlesadjuster.Actions.showTODOMessage(context); + SubtitlesAdjusterActions.showTODOMessage(context); } /** @@ -244,7 +249,7 @@ public final class Actions { *
Not null */ public static final void tree(final Context context) { - context.set(VIEW_MODE, Constants.VIEW_MODE_TREE); + context.set(VIEW_MODE, MarkupsConstants.VIEW_MODE_TREE); } /** @@ -253,7 +258,7 @@ public final class Actions { *
Not null */ public static final void text(final Context context) { - context.set(VIEW_MODE, Constants.VIEW_MODE_TEXT); + context.set(VIEW_MODE, MarkupsConstants.VIEW_MODE_TEXT); } } diff --git a/Markups/src/net/sourceforge/aprog/markups/Components.java b/Markups/src/net/sourceforge/aprog/markups/MarkupsComponents.java similarity index 90% rename from Markups/src/net/sourceforge/aprog/markups/Components.java rename to Markups/src/net/sourceforge/aprog/markups/MarkupsComponents.java index 40a7733..a746652 100644 --- a/Markups/src/net/sourceforge/aprog/markups/Components.java +++ b/Markups/src/net/sourceforge/aprog/markups/MarkupsComponents.java @@ -26,7 +26,7 @@ package net.sourceforge.aprog.markups; import static javax.swing.KeyStroke.getKeyStroke; -import static net.sourceforge.aprog.markups.Constants.Variables.*; +import static net.sourceforge.aprog.markups.MarkupsConstants.Variables.*; import static net.sourceforge.aprog.subtitlesadjuster.SubtitlesAdjusterTools.*; import static net.sourceforge.aprog.subtitlesadjuster.SubtitlesAdjusterTools.menu; import static net.sourceforge.aprog.swing.SwingTools.checkAWT; @@ -68,6 +68,8 @@ import net.sourceforge.aprog.events.Variable; import net.sourceforge.aprog.events.Variable.ValueChangedEvent; import net.sourceforge.aprog.i18n.Messages; import net.sourceforge.aprog.i18n.Translator; +import net.sourceforge.aprog.subtitlesadjuster.SubtitlesAdjusterActions; +import net.sourceforge.aprog.subtitlesadjuster.SubtitlesAdjusterComponents; import net.sourceforge.aprog.swing.SwingTools; import net.sourceforge.aprog.tools.IllegalInstantiationException; import net.sourceforge.aprog.xml.XMLTools; @@ -80,12 +82,12 @@ import org.w3c.dom.Node; * * @author codistmonk (creation 2010-07-03) */ -public final class Components { +public final class MarkupsComponents { /** * @throws IllegalInstantiationException To prevent instantiation */ - private Components() { + private MarkupsComponents() { throw new IllegalInstantiationException(); } @@ -107,12 +109,12 @@ public final class Components { result.add(newMainPanel(context)); result.addWindowListener(newListener(WindowListener.class, "windowClosing", - Actions.class, "quit", context)); + MarkupsActions.class, "quit", context)); invokeOnVariableChanged(context, FILE, - net.sourceforge.aprog.subtitlesadjuster.Actions.class, "updateMainFrameTitle", context); + SubtitlesAdjusterActions.class, "updateMainFrameTitle", context); invokeOnVariableChanged(context, FILE_MODIFIED, - net.sourceforge.aprog.subtitlesadjuster.Actions.class, "updateMainFrameTitle", context); + SubtitlesAdjusterActions.class, "updateMainFrameTitle", context); Translator.getDefaultTranslator().addListener(newListener(Translator.Listener.class, "localeChanged", SwingTools.class, "packAndUpdateMinimumSize", result)); @@ -181,7 +183,7 @@ public final class Components { public static final JMenuItem newAboutMenuItem(final Context context) { checkAWT(); - return net.sourceforge.aprog.subtitlesadjuster.Components.newAboutMenuItem(context); + return SubtitlesAdjusterComponents.newAboutMenuItem(context); } /** @@ -196,7 +198,7 @@ public final class Components { public static final JMenuItem newPreferencesMenuItem(final Context context) { checkAWT(); - return net.sourceforge.aprog.subtitlesadjuster.Components.newPreferencesMenuItem(context); + return SubtitlesAdjusterComponents.newPreferencesMenuItem(context); } /** @@ -213,13 +215,13 @@ public final class Components { if (MacAdapterTools.isMacOSX() && MacAdapterTools.getUseScreenMenuBar()) { if (registerMacOSXApplicationListener("handleQuit", - Actions.class, "quit", context)) { + MarkupsActions.class, "quit", context)) { return null; } } return item("Quit", getKeyStroke(META + " Q"), - Actions.class, "quit", context); + MarkupsActions.class, "quit", context); } /** @@ -233,7 +235,7 @@ public final class Components { */ public static final JMenuItem newNewMenuItem(final Context context) { return item("New", getKeyStroke(META + " N"), - Actions.class, "newFile", context); + MarkupsActions.class, "newFile", context); } /** @@ -247,7 +249,7 @@ public final class Components { */ public static final JMenuItem newOpenMenuItem(final Context context) { return item("Open...", getKeyStroke(META + " O"), - Actions.class, "open", context); + MarkupsActions.class, "open", context); } /** @@ -261,7 +263,7 @@ public final class Components { */ public static final JMenuItem newSaveMenuItem(final Context context) { final JMenuItem result = item("Save", getKeyStroke(META + " S"), - Actions.class, "save", context); + MarkupsActions.class, "save", context); final Variable fileModifiedVariable = context.getVariable(FILE_MODIFIED); fileModifiedVariable.addListener(new Variable.Listener() { @@ -287,7 +289,7 @@ public final class Components { */ public static final JMenuItem newSaveAsMenuItem(final Context context) { final JMenuItem result = item("Save As...", getKeyStroke(META + " shift S"), - Actions.class, "saveAs", context); + MarkupsActions.class, "saveAs", context); return result; } @@ -303,7 +305,7 @@ public final class Components { */ public static final JMenuItem newUndoMenuItem(final Context context) { final JMenuItem result = item("Undo", getKeyStroke(META + " Z"), - Actions.class, "undo", context); + MarkupsActions.class, "undo", context); return result; } @@ -319,7 +321,7 @@ public final class Components { */ public static final JMenuItem newRedoMenuItem(final Context context) { final JMenuItem result = item("Redo", getKeyStroke(META + " Y"), - Actions.class, "redo", context); + MarkupsActions.class, "redo", context); return result; } @@ -335,7 +337,7 @@ public final class Components { */ public static final JMenuItem newCopyMenuItem(final Context context) { final JMenuItem result = item("Copy", getKeyStroke(META + " C"), - Actions.class, "copy", context); + MarkupsActions.class, "copy", context); return result; } @@ -351,7 +353,7 @@ public final class Components { */ public static final JMenuItem newCutMenuItem(final Context context) { final JMenuItem result = item("Cut", getKeyStroke(META + " X"), - Actions.class, "cut", context); + MarkupsActions.class, "cut", context); return result; } @@ -367,7 +369,7 @@ public final class Components { */ public static final JMenuItem newPasteMenuItem(final Context context) { final JMenuItem result = item("Paste", getKeyStroke(META + " V"), - Actions.class, "paste", context); + MarkupsActions.class, "paste", context); return result; } @@ -383,7 +385,7 @@ public final class Components { */ public static final JMenuItem newTreeMenuItem(final Context context) { final JMenuItem result = Messages.translate(new JRadioButtonMenuItem( - SwingTools.action(Actions.class, "tree", context) + SwingTools.action(MarkupsActions.class, "tree", context) .setName("Tree"))); getOrCreateButtonGroup(context, VIEW_RADIO_GROUP).add(result); @@ -403,7 +405,7 @@ public final class Components { */ public static final JMenuItem newTextMenuItem(final Context context) { final JMenuItem result = Messages.translate(new JRadioButtonMenuItem( - SwingTools.action(Actions.class, "text", context) + SwingTools.action(MarkupsActions.class, "text", context) .setName("Text"))); getOrCreateButtonGroup(context, VIEW_RADIO_GROUP).add(result); @@ -423,7 +425,7 @@ public final class Components { public static final JMenuItem newManualMenuItem(final Context context) { return item( "Manual", getKeyStroke("F1"), - net.sourceforge.aprog.subtitlesadjuster.Actions.class, "showManual", context); + SubtitlesAdjusterActions.class, "showManual", context); } /** @@ -457,7 +459,7 @@ public final class Components { final List files = SwingTools.getFiles(event); - if (!files.isEmpty() && Actions.confirm(context)) { + if (!files.isEmpty() && MarkupsActions.confirm(context)) { context.set(FILE, files.get(0)); } } @@ -478,8 +480,8 @@ public final class Components { public static final JPanel newLayeredViews(final Context context) { final JPanel views = new JPanel(new CardLayout()); - views.add(scrollable(newDOMTreeView(context)), Constants.VIEW_MODE_TREE); - views.add(scrollable(newDOMTextView(context)), Constants.VIEW_MODE_TEXT); + views.add(scrollable(newDOMTreeView(context)), MarkupsConstants.VIEW_MODE_TREE); + views.add(scrollable(newDOMTextView(context)), MarkupsConstants.VIEW_MODE_TEXT); getOrCreateViewModeVariable(context).addListener(new Variable.Listener() { @@ -541,7 +543,7 @@ public final class Components { domVariable.setValue(XMLTools.parse(result.getText())); result.setCaretPosition(caretPosition); } catch (final Exception exception) { - net.sourceforge.aprog.subtitlesadjuster.Actions.showErrorMessage(context, exception); + SubtitlesAdjusterActions.showErrorMessage(context, exception); } } } @@ -644,7 +646,7 @@ public final class Components { Variable result = context.getVariable(VIEW_MODE); if (result == null) { - context.set(VIEW_MODE, Constants.VIEW_MODE_TREE); + context.set(VIEW_MODE, MarkupsConstants.VIEW_MODE_TREE); result = context.getVariable(VIEW_MODE); } diff --git a/Markups/src/net/sourceforge/aprog/markups/Constants.java b/Markups/src/net/sourceforge/aprog/markups/MarkupsConstants.java similarity index 98% rename from Markups/src/net/sourceforge/aprog/markups/Constants.java rename to Markups/src/net/sourceforge/aprog/markups/MarkupsConstants.java index 9cebae3..a895742 100644 --- a/Markups/src/net/sourceforge/aprog/markups/Constants.java +++ b/Markups/src/net/sourceforge/aprog/markups/MarkupsConstants.java @@ -30,12 +30,12 @@ import net.sourceforge.aprog.tools.IllegalInstantiationException; * * @author codistmonk (creation 2010-07-03) */ -public final class Constants { +public final class MarkupsConstants { /** * @throws IllegalInstantiationException To prevent instantiation */ - private Constants() { + private MarkupsConstants() { throw new IllegalInstantiationException(); } -- 2.11.4.GIT