Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull Request to create/update 'rebased/RES-711' branch #76

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Pull Request to create/update 'rebased/RES-711' branch #76

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0039741
Replaced the PDF object backing the table view with a cloned object t…
Minothor Apr 24, 2023
7876e02
Renamed methods to work with Junit4's limited ordering capabilities.
Minothor Nov 9, 2022
6541b54
Add missing copyright headers
iText-CI Nov 9, 2022
00a351f
 This is a combination of 2 commits.
Minothor Nov 9, 2022
a48b825
Tests Started.
Minothor Nov 14, 2022
8440763
Tests fleshed out and rebased to JUnit-5 format but messy - refactori…
Minothor Nov 14, 2022
016b1fe
Jenkins File updated
Minothor Apr 25, 2023
061efd8
Removed excess SureFire configuration that was breaking tests.
Minothor May 15, 2023
6caa869
Added UItest4J dependency for testing to POM
Minothor May 16, 2023
e74dace
Removed unused Junit-4 annotations, made constructors public, added d…
Minothor May 16, 2023
cf27cd5
Removed TODO notes from and commented out detritus
Minothor Jun 7, 2023
c13e10b
Fixed PdfObjectTreeEdit's getPresentationName method, cleaned up canR…
Minothor Jun 8, 2023
67d2644
Cleaned up the Main Window interception in RupsUndoRedoTest.java
Minothor Jun 8, 2023
672b13c
Removed TODO and commented out detritus
Minothor Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,16 @@
def repoName = "rups"
def dependencyRegex = "itextcore"

automaticJavaBuild(repoName, dependencyRegex, 'jdk-17-openjdk')
automaticJavaBuild(repoName, dependencyRegex)

pipeline {
agent any

stages {
stage('test') {
steps {
sh 'Xvfb -ac :99 -screen 0 1280x1024x16 & export DISPLAY=:99'
}
}
}
}
26 changes: 22 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
</scm>

<properties>
<assembly-plugin.version>3.2.0</assembly-plugin.version>
<dom4j.version>2.1.3</dom4j.version>
<itext.version>7.2.5</itext.version>
<junit-jupiter-api.version>5.9.2</junit-jupiter-api.version>
Expand All @@ -57,8 +56,11 @@
<sonar.projectName>RUPS</sonar.projectName>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
<maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
<jacoco-maven-plugin.version>0.8.9</jacoco-maven-plugin.version>
<japicmp-maven-plugin.version>0.17.2</japicmp-maven-plugin.version>
<maven-bundle-plugin.version>5.1.4</maven-bundle-plugin.version>
</properties>

Expand Down Expand Up @@ -93,6 +95,11 @@
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
</dependency>
<dependency>
<groupId>org.uispec4j</groupId>
<artifactId>uispec4j</artifactId>
<version>17.0-rc1</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>pdftest</artifactId>
Expand Down Expand Up @@ -152,7 +159,14 @@
<version>${maven-surefire-plugin.version}</version>
<configuration>
<skipTests>false</skipTests>
<argLine>@{jacoco.agent.argLine}</argLine>
<argLine>
@{jacoco.agent.argLine}
--add-opens=java.desktop/java.awt=ALL-UNNAMED
--add-opens=java.desktop/java.awt.peer=ALL-UNNAMED
--add-opens=java.desktop/sun.awt=ALL-UNNAMED
--add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED
--add-opens=java.desktop/sun.awt.windows.WToolkit=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -197,8 +211,9 @@
<version>${maven-bundle-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${assembly-plugin.version}</version>
<version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<id>make-assembly</id>
Expand Down Expand Up @@ -229,7 +244,9 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifest>
Expand All @@ -250,6 +267,7 @@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
<version>${japicmp-maven-plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/itextpdf/rups/RupsLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ This file is part of the iText (R) project.
* of a PDF file.
*/
public class RupsLauncher {

//TODO: Find out why Dependency-Check is failing after writing tests...
Minothor marked this conversation as resolved.
Show resolved Hide resolved
//TODO: Find out why maven runs from within the IDE fail to find this class...
/**
* Main method. Starts the RUPS application.
*
Expand Down
129 changes: 119 additions & 10 deletions src/main/java/com/itextpdf/rups/controller/PdfReaderController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ This file is part of the iText (R) project.
import com.itextpdf.rups.event.NodeAddDictChildEvent;
import com.itextpdf.rups.event.NodeDeleteArrayChildEvent;
import com.itextpdf.rups.event.NodeDeleteDictChildEvent;
import com.itextpdf.rups.event.NodeUpdateArrayChildEvent;
import com.itextpdf.rups.event.NodeUpdateDictChildEvent;
import com.itextpdf.rups.event.OpenPlainTextEvent;
import com.itextpdf.rups.event.OpenStructureEvent;
import com.itextpdf.rups.event.RupsEvent;
Expand Down Expand Up @@ -95,6 +97,7 @@ This file is part of the iText (R) project.
import javax.swing.event.ChangeListener;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.TreePath;

/**
Expand Down Expand Up @@ -167,7 +170,9 @@ public class PdfReaderController extends Observable implements Observer {
*/
public PdfReaderController(TreeSelectionListener treeSelectionListener,
PageSelectionListener pageSelectionListener) {

pdfTree = new PdfTree();
pdfTree.setName("pdfTree");

pdfTree.addTreeSelectionListener(treeSelectionListener);
JPopupMenu menu = PdfTreeContextMenu.getPopupMenu(pdfTree);
Expand All @@ -189,6 +194,7 @@ public PdfReaderController(TreeSelectionListener treeSelectionListener,
addObserver(text);

navigationTabs = new JTabbedPane();
navigationTabs.setName("navigationTabs");
final String pagesString = Language.PAGES.getString();
navigationTabs.addTab(pagesString, null, new JScrollPane(pages), pagesString);
navigationTabs.addTab(Language.OUTLINES.getString(), null, new JScrollPane(outlines),
Expand Down Expand Up @@ -219,17 +225,19 @@ public void stateChanged(ChangeEvent e) {
}
});

objectPanel = new PdfObjectPanel();
objectPanel = new PdfObjectPanel(this);
addObserver(objectPanel);
objectPanel.addObserver(this);
streamPane = new SyntaxHighlightedStreamPane(this);
addObserver(streamPane);
JScrollPane debug = new JScrollPane(DebugView.getInstance().getTextArea());
editorTabs = new JTabbedPane();
editorTabs.setName("editorTabs");
editorTabs.addTab(Language.STREAM.getString(), null, streamPane, Language.STREAM.getString());
editorTabs.addTab(Language.FORM_XFA.getString(), null, form.getXfaTextArea(),
Language.FORM_XFA_LONG_FORM.getString());
editorTabs.addTab(Language.DEBUG_INFO.getString(), null, debug, Language.DEBUG_INFO_DESCRIPTION.getString());

}

/**
Expand Down Expand Up @@ -290,6 +298,7 @@ public PdfSyntaxParser getParser() {
/**
* @see java.util.Observer#update(java.util.Observable, java.lang.Object)
*/
// TODO: Work out why the PDF Object appears to be updated before it even gets to this point...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still relevant?

public void update(Observable observable, Object obj) {
if (observable != null && obj instanceof RupsEvent) {
RupsEvent event = (RupsEvent) obj;
Expand Down Expand Up @@ -343,11 +352,24 @@ public void update(Observable observable, Object obj) {
case RupsEvent.NODE_ADD_DICT_CHILD_EVENT:
addTreeNodeDictChild(((NodeAddDictChildEvent.Content) event.getContent()).parent,
((NodeAddDictChildEvent.Content) event.getContent()).key,
((NodeAddDictChildEvent.Content) event.getContent()).index);
((NodeAddDictChildEvent.Content) event.getContent()).index,
((NodeAddDictChildEvent.Content) event.getContent()).value);
break;
case RupsEvent.NODE_ADD_ARRAY_CHILD_EVENT:
addTreeNodeArrayChild(((NodeAddArrayChildEvent.Content) event.getContent()).parent,
((NodeAddArrayChildEvent.Content) event.getContent()).index);
((NodeAddArrayChildEvent.Content) event.getContent()).index,
((NodeAddArrayChildEvent.Content) event.getContent()).value);
break;
case RupsEvent.NODE_UPDATE_DICT_CHILD_EVENT:
updateTreeNodeDictChild(((NodeUpdateDictChildEvent.Content) event.getContent()).parent,
((NodeUpdateDictChildEvent.Content) event.getContent()).key,
((NodeUpdateDictChildEvent.Content) event.getContent()).index,
((NodeUpdateDictChildEvent.Content) event.getContent()).value);
break;
case RupsEvent.NODE_UPDATE_ARRAY_CHILD_EVENT:
updateTreeNodeArrayChild(((NodeUpdateArrayChildEvent.Content) event.getContent()).parent,
((NodeUpdateArrayChildEvent.Content) event.getContent()).index,
((NodeUpdateArrayChildEvent.Content) event.getContent()).value);
break;
case RupsEvent.NODE_DELETE_ARRAY_CHILD_EVENT:
deleteTreeChild(((NodeDeleteArrayChildEvent.Content) event.getContent()).parent,
Expand Down Expand Up @@ -466,28 +488,115 @@ public int deleteTreeNodeDictChild(PdfObjectTreeNode parent, PdfName key) {
}

//Returns index of the added child
public int addTreeNodeDictChild(PdfObjectTreeNode parent, PdfName key, int index) {
PdfObjectTreeNode child = PdfObjectTreeNode.getInstance((PdfDictionary) parent.getPdfObject(), key);
public int addTreeNodeDictChild(PdfObjectTreeNode parent, PdfName key, int index, PdfObject childValue) {
// PdfObjectTreeNode child = PdfObjectTreeNode.getInstance((PdfDictionary) parent.getPdfObject(), key);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove commented out lines. They are tracked in git history

PdfObjectTreeNode child = PdfObjectTreeNode.getInstance(childValue, key);
return addTreeNodeChild(parent, child, index);
}

//Returns index of the added child
public int addTreeNodeArrayChild(PdfObjectTreeNode parent, int index) {
PdfObjectTreeNode child = PdfObjectTreeNode.getInstance(((PdfArray) parent.getPdfObject()).get(index, false));
return addTreeNodeChild(parent, child, index);
public int addTreeNodeArrayChild(PdfObjectTreeNode parent, int index, PdfObject child) {
PdfArray parentArray = (PdfArray) parent.getPdfObject();
// if(parentArray.size() > index)
// PdfObject childObject = parentArray.get(index, false);
PdfObjectTreeNode childNode = PdfObjectTreeNode.getInstance(child);
return addTreeNodeChild(parent, childNode, index);
}

//Returns index of the updated child
public int updateTreeNodeDictChild(PdfObjectTreeNode parent, PdfName key, int index, PdfObject child) {
//PdfObjectTreeNode child = PdfObjectTreeNode.getInstance((PdfDictionary) parent.getPdfObject(), key);
return updateTreeChild(parent, PdfObjectTreeNode.getInstance(child), index);
}

//Returns index of the updated child
public int updateTreeNodeArrayChild(PdfObjectTreeNode parent, int index, PdfObject child) {
// PdfObjectTreeNode child = PdfObjectTreeNode.getInstance(((PdfArray) parent.getPdfObject()).get(index, false));
return updateTreeChild(parent, PdfObjectTreeNode.getInstance(child), index);
}

public int deleteTreeChild(PdfObjectTreeNode parent, int index) {
//TODO: Move child and controller reference to common method with RupsEvent switch for remove/add?
parent.remove(index);
((DefaultTreeModel) pdfTree.getModel()).reload(parent);
deleteObjectChild(parent.getPdfObject(), index);
updateObject(parent);
updateView(parent);
return index;
}

//Returns index of the updated child
// TODO: Clean up and maybe move to the Wrapper class, propagating ObjectTreeNode to Object. - Nope, Wrapper is functioning more as a translation layer, keep transformation here...
public int updateTreeChild(PdfObjectTreeNode parent, PdfObjectTreeNode child, int index) {
PdfObjectTreeNode oldChild = (PdfObjectTreeNode) parent.getChildAt(index);
int childrenToTransfer = oldChild.getChildCount();
if (childrenToTransfer > 0){
for (int childIndex = 0; childIndex < childrenToTransfer; childIndex++){
PdfObjectTreeNode childToTransfer = (PdfObjectTreeNode) oldChild.getChildAt(childIndex);
addObjectChild(child.getPdfObject(),childToTransfer.getPdfObject(), child.getKey(), childIndex);
child.add((MutableTreeNode) childToTransfer);
}
}
parent.remove(oldChild);
parent.insert(child, index);
updateObjectChild(parent.getPdfObject(), child.getPdfObject(), index);
nodes.expandNode(child);
updateObject(parent);
updateView(parent);
return index;
}

//Returns index of the added child
public int addTreeNodeChild(PdfObjectTreeNode parent, PdfObjectTreeNode child, int index) {
parent.insert(child, index);
nodes.expandNode(child);
((DefaultTreeModel) pdfTree.getModel()).reload(parent);
addObjectChild(parent.getPdfObject(), child.getPdfObject(), child.getKey(), index);
updateObject(parent);
updateView(parent);
return index;
}

private void updateView(PdfObjectTreeNode parent) {
((DefaultTreeModel) pdfTree.getModel()).reload(parent);
objectPanel.render(parent,getParser());
}

private void updateObject (PdfObjectTreeNode parent){
if (parent.isDictionary()) {
PdfDictionary parentDict = (PdfDictionary) parent.getPdfObject();
parentDict.keySet();
}else if(parent.isArray()){
// TODO: Is the TreeNode driven by the PdfObject or visa versa?
// TreeNode drives the Object, but Object determines the table view...
PdfArray parentArray = (PdfArray)parent.getPdfObject();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't do anything?

}
}

protected void addObjectChild(PdfObject parent, PdfObject child, PdfName key, int index){
if (parent.isDictionary()) {
PdfDictionary parentDict = ((PdfDictionary) parent);
//TODO: Fix this for Non-existent keys or redos (Index out of Bounds)
//TODO: Fix this MESSY BODGE! >:0
parentDict.put(key, child);
}else if(parent.isArray()){
PdfArray parentArray = (PdfArray) parent;
parentArray.add(index, child);
}
}
protected void updateObjectChild(PdfObject parent, PdfObject child, int index){
if (parent.isDictionary()) {
PdfDictionary parentDict = ((PdfDictionary) parent);
parentDict.put((PdfName) parentDict.keySet().toArray()[index], child);
}else if(parent.isArray()){
PdfArray parentArray = (PdfArray) parent;
parentArray.set(index, child);
}
}
protected void deleteObjectChild(PdfObject parent, int index){
if (parent.isDictionary()) {
PdfDictionary parentDict = ((PdfDictionary) parent);
parentDict.remove((PdfName) parentDict.keySet().toArray()[index]);
}else if(parent.isArray()){
((PdfArray)parent).remove(index);
}
}
}
5 changes: 5 additions & 0 deletions src/main/java/com/itextpdf/rups/controller/RupsInstanceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,17 @@ public RupsInstanceController(Dimension dimension, JPanel owner) {
masterComponent.setDividerSize(2);

final JSplitPane content = new JSplitPane();
content.setName("content");
masterComponent.add(content, JSplitPane.TOP);
final JSplitPane info = new JSplitPane();
info.setName("info");
masterComponent.add(info, JSplitPane.BOTTOM);

content.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
content.setDividerLocation((int) (dimension.getWidth() * .6));
content.setDividerSize(1);
JPanel treePanel = new JPanel(new BorderLayout());
treePanel.setName("treePanel");
treePanel.add(new JScrollPane(readerController.getPdfTree()), BorderLayout.CENTER);
content.add(treePanel, JSplitPane.LEFT);
content.add(readerController.getNavigationTabs(), JSplitPane.RIGHT);
Expand All @@ -157,7 +160,9 @@ public RupsInstanceController(Dimension dimension, JPanel owner) {
info.setDividerSize(1);
info.add(readerController.getObjectPanel(), JSplitPane.LEFT);
final JTabbedPane editorPane = readerController.getEditorTabs();
editorPane.setName("editorPane");
final JScrollPane cons = new JScrollPane(console.getTextArea());
cons.setName("console");
console.getTextArea().addMouseListener(
new ContextMenuMouseListener(ConsoleContextMenu.getPopupMenu(console.getTextArea()),
console.getTextArea()));
Expand Down
Loading