From 677a956cf09b66298b4acaad38476bd14d64bff4 Mon Sep 17 00:00:00 2001 From: CapacitorSet Date: Sat, 31 Jan 2015 15:31:47 +0100 Subject: [PATCH] Removed dead code --- src/CirSim.java | 4 +- src/ImportExportClipboardDialog.java | 83 ---------------------------- src/ImportExportDialogFactory.java | 8 --- src/ImportExportDialogLayout.java | 41 -------------- 4 files changed, 2 insertions(+), 134 deletions(-) delete mode 100644 src/ImportExportClipboardDialog.java delete mode 100644 src/ImportExportDialogFactory.java delete mode 100644 src/ImportExportDialogLayout.java diff --git a/src/CirSim.java b/src/CirSim.java index b16fe48..7aa9a66 100755 --- a/src/CirSim.java +++ b/src/CirSim.java @@ -1999,7 +1999,7 @@ void doEdit(Editable eable) { void doImport() { if (impDialog == null) { - impDialog = ImportExportDialogFactory.Create(this, + impDialog = new ImportExportFileDialog(this, ImportExportDialog.Action.IMPORT); } // impDialog = new ImportExportClipboardDialog(this, @@ -2014,7 +2014,7 @@ void doExport(boolean url) { dump = baseURL + "#" + URLEncoder.encode(dump); } if (expDialog == null) { - expDialog = ImportExportDialogFactory.Create(this, + expDialog = new ImportExportFileDialog(this, ImportExportDialog.Action.EXPORT); // expDialog = new ImportExportClipboardDialog(this, // ImportExportDialog.Action.EXPORT); diff --git a/src/ImportExportClipboardDialog.java b/src/ImportExportClipboardDialog.java deleted file mode 100644 index 542f272..0000000 --- a/src/ImportExportClipboardDialog.java +++ /dev/null @@ -1,83 +0,0 @@ -import java.awt.*; -import java.awt.event.*; - -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.StringSelection; -import java.awt.datatransfer.Transferable; - -class ImportExportClipboardDialog -extends Dialog -implements ImportExportDialog,ActionListener -{ - CirSim cframe; - Button importButton, closeButton; - TextArea text; - Action type; - - Clipboard clipboard = null; - - ImportExportClipboardDialog(CirSim f, Action type) { - super(f, (type == Action.EXPORT) ? "Export" : "Import", false); - cframe = f; - setLayout(new ImportExportDialogLayout()); - add(text = new TextArea("", 10, 60, TextArea.SCROLLBARS_BOTH)); - if (type == Action.EXPORT) - importButton = new Button("Copy to clipboard"); - else - importButton = new Button("Import"); - this.type = type; - add(importButton); - importButton.addActionListener(this); - add(closeButton = new Button("Close")); - closeButton.addActionListener(this); - Point x = cframe.main.getLocationOnScreen(); - resize(400, 300); - Dimension d = getSize(); - setLocation(x.x + (cframe.winSize.width-d.width)/2, - x.y + (cframe.winSize.height-d.height)/2); - } - - public void setDump(String dump) - { - text.setText(dump); - } - - public void execute() - { - if ( type == Action.EXPORT ) - text.selectAll(); - setVisible(true); - } - - public void actionPerformed(ActionEvent e) { - int i; - Object src = e.getSource(); - if (src == importButton) { - if (clipboard == null) - clipboard = getToolkit().getSystemClipboard(); - if ( type == Action.EXPORT ) - { - StringSelection data = new StringSelection(text.getText()); - clipboard.setContents(data, data); - } - else - { - cframe.readSetup(text.getText()); - } - } - if (src == closeButton) - setVisible(false); - } - - public boolean handleEvent(Event ev) { - if (ev.id == Event.WINDOW_DESTROY) { - CirSim.main.requestFocus(); - setVisible(false); - cframe.impDialog = null; - return true; - } - return super.handleEvent(ev); - } - -} diff --git a/src/ImportExportDialogFactory.java b/src/ImportExportDialogFactory.java deleted file mode 100644 index 18d0974..0000000 --- a/src/ImportExportDialogFactory.java +++ /dev/null @@ -1,8 +0,0 @@ - -public class ImportExportDialogFactory { - - public static ImportExportDialog Create(CirSim f, - ImportExportDialog.Action type) { - return new ImportExportFileDialog(f, type); - } -} diff --git a/src/ImportExportDialogLayout.java b/src/ImportExportDialogLayout.java deleted file mode 100644 index 9289add..0000000 --- a/src/ImportExportDialogLayout.java +++ /dev/null @@ -1,41 +0,0 @@ -import java.awt.*; - -class ImportExportDialogLayout implements LayoutManager { - public ImportExportDialogLayout() {} - public void addLayoutComponent(String name, Component c) {} - public void removeLayoutComponent(Component c) {} - public Dimension preferredLayoutSize(Container target) { - return new Dimension(500, 500); - } - public Dimension minimumLayoutSize(Container target) { - return new Dimension(100,100); - } - public void layoutContainer(Container target) { - Insets insets = target.insets(); - int targetw = target.size().width - insets.left - insets.right; - int targeth = target.size().height - (insets.top+insets.bottom); - int i; - int pw = 300; - if (target.getComponentCount() == 0) - return; - Component cl = target.getComponent(target.getComponentCount()-1); - Dimension dl = cl.getPreferredSize(); - target.getComponent(0).move(insets.left, insets.top); - int cw = target.size().width - insets.left - insets.right; - int ch = target.size().height - insets.top - insets.bottom - - dl.height; - target.getComponent(0).resize(cw, ch); - int h = ch + insets.top; - int x = 0; - for (i = 1; i < target.getComponentCount(); i++) { - Component m = target.getComponent(i); - if (m.isVisible()) { - Dimension d = m.getPreferredSize(); - m.move(insets.left+x, h); - m.resize(d.width, d.height); - x += d.width; - } - } - } -}; -