diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/pom.xml index 86c7ffa698..d322dce1f0 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/pom.xml +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/pom.xml @@ -85,6 +85,13 @@ ${tools-zip} SmartDashboard.jar + + edu.wpi.first.wpilib.networktables + OutlineViewer + 1.0.0-SNAPSHOT + ${tools-zip} + OutlineViewer.jar + false @@ -194,5 +201,10 @@ SmartDashboard 1.0.0-SNAPSHOT + + edu.wpi.first.wpilib.networktables + OutlineViewer + 1.0.0-SNAPSHOT + diff --git a/networktables/OutlineViewer/pom.xml b/networktables/OutlineViewer/pom.xml new file mode 100644 index 0000000000..2e92afb97f --- /dev/null +++ b/networktables/OutlineViewer/pom.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + edu.wpi.first.wpilib.networktables + OutlineViewer + 1.0.0-SNAPSHOT + jar + + + UTF-8 + UTF-8 + + + + + edu.wpi.first.wpilib.networktables.java + NetworkTables + 0.1.0-SNAPSHOT + + + uk.gov.nationalarchives.thirdparty.netbeans + org-netbeans-swing-outline + 7.2 + + + + + + docline-java8-disable + + [1.8, + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + + + + + + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadoc + package + + jar + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.3.1 + + + enforce-maven + + enforce + + + + + 1.7.0 + WPILib has been tested with Java 7 (aka. 1.7.0). + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + + edu.wpi.first.tableviewer.TableViewer + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + + + + package + + shade + + + + + + + diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/AbstractTreeNode.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/AbstractTreeNode.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/AbstractTreeNode.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/AbstractTreeNode.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/BranchNode.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/BranchNode.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/BranchNode.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/BranchNode.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/LeafNode.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/LeafNode.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/LeafNode.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/LeafNode.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/NetworkTableRowModel.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/NetworkTableRowModel.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/NetworkTableRowModel.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/NetworkTableRowModel.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/OutlineFrame.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/OutlineFrame.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/OutlineFrame.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/OutlineFrame.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/TableEntryData.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/TableEntryData.java similarity index 94% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/TableEntryData.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/TableEntryData.java index b7735d31d3..36ea90d1c2 100644 --- a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/TableEntryData.java +++ b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/TableEntryData.java @@ -28,7 +28,7 @@ public class TableEntryData { * STRING * Use {@link #getEntryType(String name) getEntryType} to grab one * that isn't pre-baked. This is typically used to show custom metadata - * information from a {@code ŽäTYPEŽä} entry in a + * information from a {@code ~TYPE~} entry in a * {@link BranchNode BranchNode's} {@code Type} cell. */ public static final class EntryType { @@ -127,12 +127,12 @@ public class TableEntryData { /** * Sees if the data within this structure is metadata (i.e. has a key - * bookended by tildes ("Žä") and is in all caps). Used to show/hide metadata + * bookended by tildes ("~") and is in all caps). Used to show/hide metadata * leaves in branches. */ public boolean isMetadata() { - return key.startsWith("Žä") - && key.endsWith("Žä") + return key.startsWith("~") + && key.endsWith("~") && key.toUpperCase().equals(key); } } diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/TableViewer.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/TableViewer.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/TableViewer.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/TableViewer.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AbstractAddDialog.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AbstractAddDialog.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AbstractAddDialog.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AbstractAddDialog.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddArrayDialog.form b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddArrayDialog.form similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddArrayDialog.form rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddArrayDialog.form diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddArrayDialog.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddArrayDialog.java similarity index 99% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddArrayDialog.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddArrayDialog.java index f01772c98e..6a139a9597 100644 --- a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddArrayDialog.java +++ b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddArrayDialog.java @@ -252,7 +252,7 @@ public class AddArrayDialog extends AbstractAddDialog { } catch (NumberFormatException e) { JOptionPane.showMessageDialog( this, - "Invalid double value Žã"" + data + "Žã" in row " + (i + 1), + "Invalid double value \"" + data + "\" in row " + (i + 1), "Invalid number", JOptionPane.ERROR_MESSAGE); return null; diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddBooleanDialog.form b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddBooleanDialog.form similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddBooleanDialog.form rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddBooleanDialog.form diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddBooleanDialog.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddBooleanDialog.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddBooleanDialog.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddBooleanDialog.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddNumberDialog.form b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddNumberDialog.form similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddNumberDialog.form rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddNumberDialog.form diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddNumberDialog.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddNumberDialog.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddNumberDialog.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddNumberDialog.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddStringDialog.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddStringDialog.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/AddStringDialog.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/AddStringDialog.java diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/PreferencesDialog.form b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/PreferencesDialog.form similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/PreferencesDialog.form rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/PreferencesDialog.form diff --git a/networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/PreferencesDialog.java b/networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/PreferencesDialog.java similarity index 100% rename from networktables/OutlineViewer/src/edu/wpi/first/tableviewer/dialog/PreferencesDialog.java rename to networktables/OutlineViewer/src/main/java/edu/wpi/first/tableviewer/dialog/PreferencesDialog.java diff --git a/networktables/pom.xml b/networktables/pom.xml index f79cf70ca3..3e3e6360d3 100644 --- a/networktables/pom.xml +++ b/networktables/pom.xml @@ -9,5 +9,6 @@ java + OutlineViewer