Skip to content

Commit c6ebbbd

Browse files
michaeldemeymichaeldemey
committed
Remove plugin mode. RES-694
1 parent 4293ad7 commit c6ebbbd

File tree

13 files changed

+54
-90
lines changed

13 files changed

+54
-90
lines changed

‎src/main/java/com/itextpdf/rups/controller/PdfReaderController.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ This file is part of the iText (R) project.
8282
import com.itextpdf.rups.view.itext.treenodes.PdfObjectTreeNode;
8383
import com.itextpdf.rups.view.itext.treenodes.PdfTrailerTreeNode;
8484

85+
import java.awt.Color;
86+
import java.awt.event.KeyListener;
87+
import java.util.Observable;
88+
import java.util.Observer;
89+
import java.util.Stack;
8590
import javax.swing.JPanel;
8691
import javax.swing.JPopupMenu;
8792
import javax.swing.JScrollPane;
@@ -91,11 +96,6 @@ This file is part of the iText (R) project.
9196
import javax.swing.event.TreeSelectionListener;
9297
import javax.swing.tree.DefaultTreeModel;
9398
import javax.swing.tree.TreePath;
94-
import java.awt.Color;
95-
import java.awt.event.KeyListener;
96-
import java.util.Observable;
97-
import java.util.Observer;
98-
import java.util.Stack;
9999

100100
/**
101101
* Controls the components that get their content from iText's PdfReader.
@@ -164,10 +164,9 @@ public class PdfReaderController extends Observable implements Observer {
164164
*
165165
* @param treeSelectionListener when somebody selects a tree node, this listener listens to the event
166166
* @param pageSelectionListener when somebody changes a page, this listener changes accordingly
167-
* @param pluginMode the plugin mode
168167
*/
169-
public PdfReaderController(TreeSelectionListener treeSelectionListener, PageSelectionListener pageSelectionListener,
170-
boolean pluginMode) {
168+
public PdfReaderController(TreeSelectionListener treeSelectionListener,
169+
PageSelectionListener pageSelectionListener) {
171170
pdfTree = new PdfTree();
172171

173172
pdfTree.addTreeSelectionListener(treeSelectionListener);
@@ -220,10 +219,10 @@ public void stateChanged(ChangeEvent e) {
220219
}
221220
});
222221

223-
objectPanel = new PdfObjectPanel(pluginMode);
222+
objectPanel = new PdfObjectPanel();
224223
addObserver(objectPanel);
225224
objectPanel.addObserver(this);
226-
streamPane = new SyntaxHighlightedStreamPane(this, pluginMode);
225+
streamPane = new SyntaxHighlightedStreamPane(this);
227226
addObserver(streamPane);
228227
JScrollPane debug = new JScrollPane(DebugView.getInstance().getTextArea());
229228
editorTabs = new JTabbedPane();

‎src/main/java/com/itextpdf/rups/controller/RupsInstanceController.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ This file is part of the iText (R) project.
9595
public class RupsInstanceController extends Observable
9696
implements TreeSelectionListener, PageSelectionListener, Observer {
9797

98-
private final boolean pluginMode;
99-
10098
private final JPanel ownerPanel;
10199

102100
/**
@@ -124,18 +122,16 @@ public class RupsInstanceController extends Observable
124122
/**
125123
* Constructs the GUI components of the RUPS application.
126124
*
127-
* @param dimension the dimension
128-
* @param owner the jpanel
129-
* @param pluginMode the plugin mode
125+
* @param dimension the dimension
126+
* @param owner the jpanel
130127
*/
131-
public RupsInstanceController(Dimension dimension, JPanel owner, boolean pluginMode) {
128+
public RupsInstanceController(Dimension dimension, JPanel owner) {
132129
// creating components and controllers
133130
this.ownerPanel = owner;
134-
this.pluginMode = pluginMode;
135131
final Console console = Console.getInstance();
136132
addObserver(console);
137133
console.addObserver(this);
138-
readerController = new PdfReaderController(this, this, pluginMode);
134+
readerController = new PdfReaderController(this, this);
139135
addObserver(readerController);
140136

141137
// creating the master component
@@ -342,14 +338,12 @@ public void highlightChanges(CompareTool.CompareResult compareResult) {
342338

343339
private void startObjectLoader() {
344340
final ProgressDialog dialog =
345-
new ProgressDialog(this.ownerPanel, Language.PDF_READING.getString(), null, pluginMode);
346-
if (!pluginMode) {
347-
SwingUtilities.invokeLater(new Runnable() {
348-
public void run() {
349-
dialog.setVisible(true);
350-
}
351-
});
352-
}
341+
new ProgressDialog(this.ownerPanel, Language.PDF_READING.getString(), null);
342+
SwingUtilities.invokeLater(new Runnable() {
343+
public void run() {
344+
dialog.setVisible(true);
345+
}
346+
});
353347
loader = new ObjectLoader(this, pdfFile, pdfFile.getFilename(), dialog);
354348
loader.start();
355349
}

‎src/main/java/com/itextpdf/rups/model/ProgressDialog.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,16 @@ public final class ProgressDialog extends JDialog implements IProgressDialog {
7575
*/
7676
public static final JLabel INFO = new JLabel(UIManager.getIcon("OptionPane.informationIcon"));
7777

78-
private final boolean pluginMode;
79-
8078
/**
8179
* Creates a Progress frame displaying a certain message
8280
* and a progress bar in indeterminate mode.
8381
*
8482
* @param parent the parent frame of this dialog (used to position the dialog)
8583
* @param msg the message that will be displayed.
8684
* @param frame the frame
87-
* @param pluginMode the plugin mode
8885
*/
89-
public ProgressDialog(Component parent, String msg, Frame frame, boolean pluginMode) {
90-
super(frame, !pluginMode);
91-
this.pluginMode = pluginMode;
86+
public ProgressDialog(Component parent, String msg, Frame frame) {
87+
super(frame);
9288
this.setTitle(Language.DIALOG_PROGRESS.getString());
9389
setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
9490
setSize(300, 100);
@@ -115,9 +111,7 @@ public ProgressDialog(Component parent, String msg, Frame frame, boolean pluginM
115111
public void dispose() {
116112
final Window frame = getOwner();
117113
super.dispose();
118-
if (!pluginMode) {
119-
frame.dispatchEvent(new WindowEvent(frame, WindowEvent.WINDOW_CLOSING));
120-
}
114+
frame.dispatchEvent(new WindowEvent(frame, WindowEvent.WINDOW_CLOSING));
121115
}
122116

123117
/**

‎src/main/java/com/itextpdf/rups/view/RupsTabbedPane.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void openNewFile(File file, Dimension dimension, boolean readonly) {
7777
}
7878

7979
RupsPanel rupsPanel = new RupsPanel();
80-
RupsInstanceController rupsInstanceController = new RupsInstanceController(dimension, rupsPanel, false);
80+
RupsInstanceController rupsInstanceController = new RupsInstanceController(dimension, rupsPanel);
8181
rupsPanel.setRupsInstanceController(rupsInstanceController);
8282
rupsInstanceController.loadFile(file, readonly);
8383
this.jTabbedPane.addTab(file.getName(), null, rupsPanel);

‎src/main/java/com/itextpdf/rups/view/contextmenu/InspectObjectAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void actionPerformed(ActionEvent e) {
8686

8787
final PdfObjectTreeNode node =
8888
(PdfObjectTreeNode) ((PdfTree) invoker).getSelectionPath().getLastPathComponent();
89-
final SyntaxHighlightedStreamPane syntaxHighlightedStreamPane = new SyntaxHighlightedStreamPane(null, true);
89+
final SyntaxHighlightedStreamPane syntaxHighlightedStreamPane = new SyntaxHighlightedStreamPane(null);
9090

9191
frame.add(syntaxHighlightedStreamPane);
9292
syntaxHighlightedStreamPane.render(node);

‎src/main/java/com/itextpdf/rups/view/contextmenu/StreamPanelContextMenu.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ public class StreamPanelContextMenu extends JPopupMenu {
6363

6464
private final JMenuItem saveToStream;
6565

66-
private final boolean pluginMode;
67-
6866
/**
6967
* Creates a context menu (right click menu) with two actions:
7068
* - copy
@@ -74,14 +72,10 @@ public class StreamPanelContextMenu extends JPopupMenu {
7472
*
7573
* @param textPane the text pane
7674
* @param controller the controller
77-
* @param pluginMode the plugin mode
7875
*/
79-
public StreamPanelContextMenu(final JTextPane textPane, final SyntaxHighlightedStreamPane controller,
80-
boolean pluginMode) {
76+
public StreamPanelContextMenu(final JTextPane textPane, final SyntaxHighlightedStreamPane controller) {
8177
super();
8278

83-
this.pluginMode = pluginMode;
84-
8579
final JMenuItem copyItem = getJMenuItem(
8680
new CopyToClipboardAction(Language.COPY.getString(), textPane)
8781
);
@@ -107,7 +101,7 @@ public StreamPanelContextMenu(final JTextPane textPane, final SyntaxHighlightedS
107101
}
108102

109103
public void setSaveToStreamEnabled(boolean enabled) {
110-
saveToStream.setEnabled(enabled && !pluginMode);
104+
saveToStream.setEnabled(enabled);
111105
}
112106

113107
static final JMenuItem getJMenuItem(Action rupsAction) {

‎src/main/java/com/itextpdf/rups/view/itext/PdfObjectPanel.java‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ This file is part of the iText (R) project.
6262
import com.itextpdf.rups.view.models.DictionaryTableModelButton;
6363
import com.itextpdf.rups.view.models.PdfArrayTableModel;
6464

65+
import java.awt.CardLayout;
66+
import java.awt.event.MouseAdapter;
67+
import java.awt.event.MouseEvent;
68+
import java.util.Observable;
69+
import java.util.Observer;
6570
import javax.swing.JPanel;
6671
import javax.swing.JScrollPane;
6772
import javax.swing.JTable;
6873
import javax.swing.JTextArea;
6974
import javax.swing.event.TableModelEvent;
7075
import javax.swing.event.TableModelListener;
71-
import java.awt.CardLayout;
72-
import java.awt.event.MouseAdapter;
73-
import java.awt.event.MouseEvent;
74-
import java.util.Observable;
75-
import java.util.Observer;
7676

7777
public class PdfObjectPanel extends Observable implements Observer {
7878

@@ -104,21 +104,15 @@ public class PdfObjectPanel extends Observable implements Observer {
104104
*/
105105
JTextArea text = new JTextArea();
106106

107-
private final boolean pluginMode;
108-
109107
private final JPanel panel = new JPanel();
110108

111109
private PdfObjectTreeNode target;
112110

113111

114112
/**
115113
* Creates a PDF object panel.
116-
*
117-
* @param pluginMode the plugin mode
118114
*/
119-
public PdfObjectPanel(boolean pluginMode) {
120-
this.pluginMode = pluginMode;
121-
115+
public PdfObjectPanel() {
122116
// layout
123117
panel.setLayout(layout);
124118

@@ -179,25 +173,21 @@ public void render(PdfObjectTreeNode node, PdfSyntaxParser parser) {
179173
case PdfObject.DICTIONARY:
180174
case PdfObject.STREAM:
181175
final DictionaryTableModel model =
182-
new DictionaryTableModel((PdfDictionary) object, pluginMode, parser, panel);
176+
new DictionaryTableModel((PdfDictionary) object, parser, panel);
183177
model.addTableModelListener(new DictionaryModelListener());
184178
table.setModel(model);
185-
if (!pluginMode) {
186-
table.getColumn("").setCellRenderer(new DictionaryTableModelButton(IconFetcher.getIcon(CROSS_ICON),
187-
IconFetcher.getIcon(ADD_ICON)));
188-
}
179+
table.getColumn("").setCellRenderer(new DictionaryTableModelButton(
180+
IconFetcher.getIcon(CROSS_ICON), IconFetcher.getIcon(ADD_ICON)));
189181
layout.show(panel, TABLE);
190182
panel.repaint();
191183
break;
192184
case PdfObject.ARRAY:
193185
final PdfArrayTableModel arrayModel =
194-
new PdfArrayTableModel((PdfArray) object, pluginMode, parser, panel);
186+
new PdfArrayTableModel((PdfArray) object, parser, panel);
195187
arrayModel.addTableModelListener(new ArrayModelListener());
196188
table.setModel(arrayModel);
197-
if (!pluginMode) {
198-
table.getColumn("").setCellRenderer(new DictionaryTableModelButton(IconFetcher.getIcon(CROSS_ICON),
199-
IconFetcher.getIcon(ADD_ICON)));
200-
}
189+
table.getColumn("").setCellRenderer(new DictionaryTableModelButton(IconFetcher.getIcon(CROSS_ICON),
190+
IconFetcher.getIcon(ADD_ICON)));
201191
layout.show(panel, TABLE);
202192
panel.repaint();
203193
break;

‎src/main/java/com/itextpdf/rups/view/itext/SyntaxHighlightedStreamPane.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,15 @@ public class SyntaxHighlightedStreamPane extends JScrollPane implements Observer
120120
* Constructs a SyntaxHighlightedStreamPane.
121121
*
122122
* @param controller the pdf reader controller
123-
* @param pluginMode the plugin mode
124123
*/
125-
public SyntaxHighlightedStreamPane(PdfReaderController controller, boolean pluginMode) {
124+
public SyntaxHighlightedStreamPane(PdfReaderController controller) {
126125
super();
127126
this.text = new JSyntaxPane();
128127
ToolTipManager.sharedInstance().registerComponent(text);
129128
setViewportView(text);
130129
this.controller = controller;
131130

132-
popupMenu = new StreamPanelContextMenu(text, this, pluginMode);
131+
popupMenu = new StreamPanelContextMenu(text, this);
133132
text.setComponentPopupMenu(popupMenu);
134133
text.addMouseListener(new ContextMenuMouseListener(popupMenu, text));
135134

‎src/main/java/com/itextpdf/rups/view/models/DictionaryTableModel.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ This file is part of the iText (R) project.
5858
*/
5959
public class DictionaryTableModel extends AbstractPdfObjectPanelTableModel {
6060

61-
private final boolean pluginMode;
6261
private final PdfSyntaxParser parser;
6362
/**
6463
* The owner component on witch will be displayed all messages
@@ -77,12 +76,10 @@ public class DictionaryTableModel extends AbstractPdfObjectPanelTableModel {
7776
* Creates the TableModel.
7877
*
7978
* @param dictionary the dictionary we want to show
80-
* @param pluginMode the plugin mode
8179
* @param parser the pdf syntax parser
8280
* @param owner the owner
8381
*/
84-
public DictionaryTableModel(PdfDictionary dictionary, boolean pluginMode, PdfSyntaxParser parser, Component owner) {
85-
this.pluginMode = pluginMode;
82+
public DictionaryTableModel(PdfDictionary dictionary, PdfSyntaxParser parser, Component owner) {
8683
this.dictionary = dictionary;
8784
this.parser = parser;
8885
this.parent = owner;
@@ -93,20 +90,20 @@ public DictionaryTableModel(PdfDictionary dictionary, boolean pluginMode, PdfSyn
9390
* @see javax.swing.table.TableModel#getColumnCount()
9491
*/
9592
public int getColumnCount() {
96-
return pluginMode ? 2 : 3;
93+
return 3;
9794
}
9895

9996
/**
10097
* @see javax.swing.table.TableModel#getRowCount()
10198
*/
10299
public int getRowCount() {
103-
return pluginMode ? dictionary.size() : dictionary.size() + 1;
100+
return dictionary.size() + 1;
104101
}
105102

106103

107104
@Override
108105
public boolean isCellEditable(int rowIndex, int columnIndex) {
109-
return !pluginMode && columnIndex < 2;
106+
return columnIndex < 2;
110107
}
111108

112109
/**

‎src/main/java/com/itextpdf/rups/view/models/PdfArrayTableModel.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public class PdfArrayTableModel extends AbstractPdfObjectPanelTableModel {
6262
*/
6363
protected PdfArray array;
6464

65-
private final boolean pluginMode;
6665
private final PdfSyntaxParser parser;
6766
/**
6867
* The owner component on witch will be displayed all messages
@@ -75,27 +74,25 @@ public class PdfArrayTableModel extends AbstractPdfObjectPanelTableModel {
7574
* Creates the TableModel.
7675
*
7776
* @param array a PDF array
78-
* @param pluginMode the plugin mode
7977
* @param parser the pdf syntax parser
8078
* @param parent the parent
8179
*/
82-
public PdfArrayTableModel(PdfArray array, boolean pluginMode, PdfSyntaxParser parser, Component parent) {
80+
public PdfArrayTableModel(PdfArray array, PdfSyntaxParser parser, Component parent) {
8381
this.array = array;
84-
this.pluginMode = pluginMode;
8582
this.parser = parser;
8683
this.parent = parent;
8784
}
8885

8986
@Override
9087
public boolean isCellEditable(int rowIndex, int columnIndex) {
91-
return !pluginMode && columnIndex < 1;
88+
return columnIndex < 1;
9289
}
9390

9491
/**
9592
* @see javax.swing.table.TableModel#getColumnCount()
9693
*/
9794
public int getColumnCount() {
98-
return pluginMode ? 1 : 2;
95+
return 2;
9996
}
10097

10198
/**

0 commit comments

Comments
 (0)