more json schema support

src/main/java/org/cip4/tools/jdfeditor/AddRequiredAttrEdit.java

@@ -71,6 +71,7 @@
 package org.cip4.tools.jdfeditor;
 
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 import javax.swing.tree.TreePath;
 import javax.swing.undo.CannotRedoException;

src/main/java/org/cip4/tools/jdfeditor/AddRequiredElemEdit.java

@@ -78,6 +78,7 @@
 
 import org.cip4.jdflib.core.KElement;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * AddRequiredElemEdit.java

src/main/java/org/cip4/tools/jdfeditor/CheckJDFScrollPane.java

@@ -80,17 +80,19 @@
 import org.cip4.jdflib.core.VString;
 import org.cip4.jdflib.core.XMLDoc;
 import org.cip4.tools.jdfeditor.view.renderer.CheckJDFOutputTreeCellRenderer;
+import org.cip4.tools.jdfeditor.view.renderer.CheckJDFOutputWrapper;
+import org.cip4.tools.jdfeditor.view.renderer.JSONSchemaOutputWrapper;
 
 /**
  * this class encapsulates the output of the dev caps test
+ * 
  * @author prosirai
  *
  */
 public class CheckJDFScrollPane extends ValidationScrollPane
 {
 	private static final long serialVersionUID = 2367868076065696719L;
 
-	private CheckJDFOutputWrapper checkJDFRoot;
 	private CheckJDFOutputTreeCellRenderer treeCellRenderer;
 
 	public CheckJDFScrollPane()
@@ -108,27 +110,56 @@ public void updateCellRenderer()
 	/**
 	 * 
 	 * TODO Please insert comment!
+	 * 
 	 * @param bugReport
 	 */
 	public void drawCheckJDFOutputTree(final XMLDoc bugReport)
 	{
 		if (bugReport == null)
 			return;
-		KElement repRoot = bugReport.getRoot().getChildByTagName("CheckJDFOutput", null, 0, null, false, true);
+		final KElement repRoot = bugReport.getRoot().getChildByTagName("CheckJDFOutput", null, 0, null, false, true);
 		if (repRoot == null)
 			return;
-		checkJDFRoot = new CheckJDFOutputWrapper(repRoot);
+		final CheckJDFOutputWrapper checkJDFRoot = new CheckJDFOutputWrapper(repRoot);
 		m_reportTree = new JTree(checkJDFRoot);
 		m_reportTree.setModel(new JDFTreeModel(checkJDFRoot, false));
 		m_reportTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
 		m_reportTree.setExpandsSelectedPaths(true);
 		m_reportTree.setEditable(false);
 		ToolTipManager.sharedInstance().registerComponent(m_reportTree);
 
-		//DCOutputWrapper bugReportRoot = null;
-
 		setCheckJDFOutputTree(checkJDFRoot);
-		//        m_reportTree.expandPath(new TreePath(bugReportRoot.getPath()));
+		m_reportTree.expandPath(new TreePath(checkJDFRoot.getPath()));
+
+		m_SelectionListener = new ValidationSelectionListener();
+		m_reportTree.addTreeSelectionListener(m_SelectionListener);
+
+		m_reportTree.setCellRenderer(treeCellRenderer);
+		m_reportTree.setRowHeight(0); // apply height of each cell from cell-renderer
+
+		final ValidationPopupListener popupListener = new ValidationPopupListener();
+		m_reportTree.addMouseListener(popupListener);
+
+		getViewport().setView(m_reportTree);
+	}
+
+	/**
+	 * 
+	 * @param bugReport
+	 */
+	public void drawJSONSchemaOutputTree(final XMLDoc bugReport)
+	{
+		final KElement repRoot = bugReport.getRoot();
+		final JSONSchemaOutputWrapper checkJDFRoot = new JSONSchemaOutputWrapper(repRoot);
+		m_reportTree = new JTree(checkJDFRoot);
+		m_reportTree.setModel(new JDFTreeModel(checkJDFRoot, false));
+		m_reportTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
+		m_reportTree.setExpandsSelectedPaths(true);
+		m_reportTree.setEditable(false);
+		ToolTipManager.sharedInstance().registerComponent(m_reportTree);
+
+		setJSONSchemaOutputTree(checkJDFRoot);
+		// m_reportTree.expandPath(new TreePath(bugReportRoot.getPath()));
 		m_reportTree.expandPath(new TreePath(checkJDFRoot.getPath()));
 
 		m_SelectionListener = new ValidationSelectionListener();
@@ -145,9 +176,9 @@ public void drawCheckJDFOutputTree(final XMLDoc bugReport)
 
 	private void setCheckJDFOutputTree(final CheckJDFOutputWrapper bugReport)
 	{
-		KElement repElem = bugReport.getElement();
+		final KElement repElem = bugReport.getElement();
 		// now add the individual attributes
-		VString vAtts = repElem.getAttributeVector();
+		final VString vAtts = repElem.getAttributeVector();
 		for (int i = 0; i < vAtts.size(); i++)
 		{
 			final String stringAt = vAtts.get(i);
@@ -173,18 +204,39 @@ private void setCheckJDFOutputTree(final CheckJDFOutputWrapper bugReport)
 				continue;
 			if (stringAt.equals("Separation"))
 				continue;
-			CheckJDFOutputWrapper next = new CheckJDFOutputWrapper(repElem.getAttributeNode(stringAt));
+			final CheckJDFOutputWrapper next = new CheckJDFOutputWrapper(repElem.getAttributeNode(stringAt));
 			bugReport.add(next);
 		}
 		// recurse through children
-		VElement childVector = repElem.getChildElementVector(null, null, null, true, 0, false);
+		final VElement childVector = repElem.getChildElementVector(null, null, null, true, 0, false);
 		for (int i = 0; i < childVector.size(); i++)
 		{
-			KElement kEl = childVector.elementAt(i);
-			CheckJDFOutputWrapper next = new CheckJDFOutputWrapper(kEl);
+			final KElement kEl = childVector.elementAt(i);
+			final CheckJDFOutputWrapper next = new CheckJDFOutputWrapper(kEl);
 			setCheckJDFOutputTree(next);
 			bugReport.add(next);
 		}
 	}
 
+	private void setJSONSchemaOutputTree(final JSONSchemaOutputWrapper checkJDFRoot)
+	{
+		final KElement repElem = checkJDFRoot.getElement();
+		final VString vAtts = repElem.getAttributeVector();
+		for (final String stringAt : vAtts)
+		{
+			final JSONSchemaOutputWrapper next = new JSONSchemaOutputWrapper(repElem.getAttributeNode(stringAt));
+			checkJDFRoot.add(next);
+		}
+
+		final VElement childVector = repElem.getChildElementVector(null, null, null, true, 0, false);
+		childVector.unifyElement();
+		childVector.sort();
+		for (final KElement kEl : childVector)
+		{
+			final JSONSchemaOutputWrapper next = new JSONSchemaOutputWrapper(kEl);
+			setJSONSchemaOutputTree(next);
+			checkJDFRoot.add(next);
+		}
+	}
+
 }

src/main/java/org/cip4/tools/jdfeditor/DCOutputWrapper.java

@@ -72,6 +72,7 @@
 
 import org.cip4.jdflib.core.KElement;
 import org.cip4.jdflib.node.JDFNode;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 import org.w3c.dom.Attr;
 
 

src/main/java/org/cip4/tools/jdfeditor/DeleteItemEdit.java

@@ -71,6 +71,7 @@
 package org.cip4.tools.jdfeditor;
 
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 import javax.swing.tree.TreePath;
 import javax.swing.undo.CannotRedoException;

src/main/java/org/cip4/tools/jdfeditor/EditorDocument.java

@@ -109,6 +109,7 @@
 import org.cip4.tools.jdfeditor.service.SettingService;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 import org.json.simple.JSONObject;
 
 /**

src/main/java/org/cip4/tools/jdfeditor/EditorMenuBar.java

@@ -98,6 +98,7 @@
 import org.cip4.tools.jdfeditor.menu.MenuEdit;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * Class to implement all the menu bar and menu related stuff moved here from JDFFrame

src/main/java/org/cip4/tools/jdfeditor/EditorTabbedPaneA.java

@@ -89,6 +89,7 @@
 import org.cip4.jdflib.util.StringUtil;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * this handles anything located in the top right tabbed panes it has been misused as a dump from JDFFrame

src/main/java/org/cip4/tools/jdfeditor/EditorTabbedPaneB.java

@@ -87,6 +87,7 @@
 import org.cip4.tools.jdfeditor.service.RuntimeProperties;
 import org.cip4.tools.jdfeditor.util.FontUtil;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.fife.ui.rtextarea.RTextScrollPane;

src/main/java/org/cip4/tools/jdfeditor/EditorUtils.java

@@ -122,6 +122,7 @@
 import org.cip4.tools.jdfeditor.streamloader.PluginLoader;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * static utilities for the editor

src/main/java/org/cip4/tools/jdfeditor/InsertAttrEdit.java

@@ -75,6 +75,7 @@
 import javax.swing.undo.CannotUndoException;
 
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /*
  * InsertAttrEdit.java

src/main/java/org/cip4/tools/jdfeditor/InsertElementEdit.java

@@ -77,6 +77,7 @@
 
 import org.cip4.jdflib.core.KElement;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /*
  * InsertElementAfterEdit.java

src/main/java/org/cip4/tools/jdfeditor/InsertResourceAndLinkEdit.java

@@ -81,6 +81,7 @@
 import org.cip4.jdflib.pool.JDFResourceLinkPool;
 import org.cip4.jdflib.pool.JDFResourcePool;
 import org.cip4.jdflib.resource.JDFResource;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * InsertResourceAndLinkEdit.java

src/main/java/org/cip4/tools/jdfeditor/InsertResourceLinkEdit.java

@@ -7,6 +7,7 @@
 import org.cip4.jdflib.core.JDFResourceLink;
 import org.cip4.jdflib.node.JDFNode;
 import org.cip4.jdflib.pool.JDFResourceLinkPool;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /*
  * InsertResourceLinkEdit.java

src/main/java/org/cip4/tools/jdfeditor/JDFFrame.java

@@ -150,6 +150,7 @@
 import org.cip4.tools.jdfeditor.util.RecentFileUtil;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * @author AnderssA ThunellE SvenoniusI Elena Skobchenko

src/main/java/org/cip4/tools/jdfeditor/JDFInOutScroll.java

@@ -103,6 +103,7 @@
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
 import org.cip4.tools.jdfeditor.view.renderer.JDFResourceTreeCellRenderer;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * 

src/main/java/org/cip4/tools/jdfeditor/JDFTreeArea.java

@@ -122,6 +122,7 @@
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
 import org.cip4.tools.jdfeditor.view.renderer.JDFTreeCellRenderer;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * This is a new dump for some of the JDFFrame classes that relate to the actual tree view TODO move some of the routines here into the model where they belong and reduce the

src/main/java/org/cip4/tools/jdfeditor/JDFTreeCopyNode.java

@@ -80,6 +80,7 @@
 import org.cip4.tools.jdfeditor.service.SettingService;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * class to handle copy / paste actions from the frame

src/main/java/org/cip4/tools/jdfeditor/JDFTreeModel.java

@@ -125,6 +125,7 @@
 import org.cip4.tools.jdfeditor.service.SettingService;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 import org.w3c.dom.Attr;
 
 import com.networknt.schema.ValidationMessage;
@@ -276,6 +277,7 @@ public boolean validate()
 		}
 		if (eDoc.isJson())
 		{
+			validateXJDF();
 			return validateJSON();
 		}
 		else if (eDoc.isXJDF())
@@ -299,17 +301,19 @@ boolean validateJSON()
 		final JSONSchemaReader sr = new JSONSchemaReader(EditorUtils.RES_SCHEMA_JSON);
 		final Collection<ValidationMessage> results = sr.checkJSON(json);
 		validationResult = null;
-		final KElement schemaValidationResult = KElement.createRoot("SchemaValidationOutput", null);
-		schemaValidationResult.setAttribute("SchemaLocation", EditorUtils.RES_SCHEMA_JSON);
-		schemaValidationResult.setAttribute("ValidationResult", ContainerUtil.isEmpty(results) ? "Valid" : "Error");
+		final KElement jsonSchemaResult = KElement.createRoot("JSONSchema", null);
+		jsonSchemaResult.setAttribute("SchemaLocation", EditorUtils.RES_SCHEMA_JSON);
+		jsonSchemaResult.setAttribute("ValidationResult", ContainerUtil.isEmpty(results) ? "Valid" : "Error");
 		for (final ValidationMessage m : results)
 		{
-			final KElement error = schemaValidationResult.appendElement("Error");
+			final String loc = m.getInstanceLocation().toString();
+			final String typ = "$".equals(loc) ? "Warning" : "Error";
+			final KElement error = jsonSchemaResult.appendElement(typ);
 			error.setAttribute("Message", m.toString());
-			error.setAttribute("Path", m.getInstanceLocation().toString());
+			error.setAttribute("Path", loc);
 		}
 		final JDFFrame m_frame = MainView.getFrame();
-		m_frame.getBottomTabs().m_SchemaErrScroll.drawSchemaOutputTree(schemaValidationResult.getOwnerDocument_KElement());
+		m_frame.getBottomTabs().m_validErrScroll.drawJSONSchemaOutputTree(jsonSchemaResult.getOwnerDocument_KElement());
 		if (MainView.getEditorDoc().getJDFTree() != null)
 		{
 			MainView.getEditorDoc().getJDFTree().repaint();

src/main/java/org/cip4/tools/jdfeditor/JDFTreeNodeEnumeration.java

@@ -71,6 +71,9 @@
 package org.cip4.tools.jdfeditor;
 
 import javax.swing.tree.TreeNode;
+
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
+
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
 

src/main/java/org/cip4/tools/jdfeditor/ModifyAttrEdit.java

@@ -75,6 +75,7 @@
 import javax.swing.undo.CannotUndoException;
 
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 import org.w3c.dom.Attr;
 
 /**

src/main/java/org/cip4/tools/jdfeditor/PasteItemEdit.java

@@ -1,5 +1,6 @@
 package org.cip4.tools.jdfeditor;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 import javax.swing.tree.TreePath;
 import javax.swing.undo.AbstractUndoableEdit;

src/main/java/org/cip4/tools/jdfeditor/PopUpRightClick.java

@@ -98,6 +98,7 @@
 import org.cip4.tools.jdfeditor.service.SettingService;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * Class to implement all the menu bar and menu related stuff moved here from JDFFrame

src/main/java/org/cip4/tools/jdfeditor/ProcessPanel.java

@@ -108,6 +108,7 @@
 import org.cip4.jdflib.resource.JDFResource;
 import org.cip4.tools.jdfeditor.util.ResourceUtil;
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 /**
  * 

src/main/java/org/cip4/tools/jdfeditor/RenameNodeEdit.java

@@ -71,6 +71,7 @@
 package org.cip4.tools.jdfeditor;
 
 import org.cip4.tools.jdfeditor.view.MainView;
+import org.cip4.tools.jdfeditor.view.renderer.JDFTreeNode;
 
 import javax.swing.tree.TreePath;
 import javax.swing.undo.CannotRedoException;