v0.9.2 markdown/asciidoc viewer with dark mode, various refactoring

v0.9.2 markdown/asciidoc viewer with dark mode, various refactoring
- reorganized HtmlPane and DocServiceLoader to viewer sub-module
- HyperlinkListener is moved into HtmlPane and vaadin Open is used
  to launch browser. HtmlPane link launch on click is self-contained.
  Better user experience, with vaadin Open
- added automatic junit tests in viewer submodule
  tests DocServiceLoader (all methods)
  and HtmlPane (load(), reload()) against
  org.jmarkdownviewer.service.md.MarkDownService
  MarkDownService is now default dependency for viewer submodule.
  i.e. MarkDown support is included by default with viewer submodule.
- App classes e.g. mdaadocviewer, mdviewer now links viewer submodule
  as dependency and sub-class HtmlPane to add app specific functions.

Author: ag88

.gitignore

@@ -8,3 +8,4 @@ markdown-lib/target
 mdadocviewer/target
 mdviewer/target
 viewer/target
+archive

asciidoc-lib/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.jmarkdownviewer</groupId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 
 	<groupId>org.jmarkdownviewer</groupId>

docservice-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.jmarkdownviewer</groupId>
-    <version>0.9.1</version>
+    <version>0.9.2</version>
   </parent>
 
   <groupId>org.jmarkdownviewer</groupId>

markdown-lib/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.jmarkdownviewer</groupId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 
 	<groupId>org.jmarkdownviewer</groupId>

mdadocviewer/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.jmarkdownviewer</groupId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 
 	<groupId>org.jmarkdownviewer</groupId>
@@ -27,6 +27,11 @@
 			<artifactId>docservice-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.jmarkdownviewer</groupId>
+			<artifactId>viewer</artifactId>
+			<version>${project.version}</version>
+		</dependency>		
 		<dependency>
 			<groupId>org.jmarkdownviewer</groupId>
 			<artifactId>markdown-lib</artifactId>
@@ -37,11 +42,6 @@
 			<artifactId>asciidoc-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.vaadin</groupId>
-			<artifactId>open</artifactId>
-			<version>8.5.0.4</version>
-		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>

mdadocviewer/src/main/java/org/jmarkdownviewer/jmdviewer/MainFrame.java

@@ -44,14 +44,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jmarkdownviewer.jmdviewer.service.DocServiceLoader;
 import org.jmarkdownviewer.parser.MarkdownParser;
 import org.jmarkdownviewer.service.DocService;
+import org.jmarkdownviewer.viewer.HtmlPane;
+import org.jmarkdownviewer.viewer.service.DocServiceLoader;
 
 import com.vaadin.open.Open;
 
 
-public class MainFrame extends JFrame implements ActionListener, HyperlinkListener {
+public class MainFrame extends JFrame implements ActionListener {
 
 	Logger log = LogManager.getLogger(MainFrame.class);
 
@@ -116,12 +117,10 @@ public void createGui() {
 		add(toolbar, BorderLayout.NORTH);
 
 		if (stylesheet == null)
-			htmlpane = new HtmlPane();
+			htmlpane = new MdAdocHtmlPane();
 		else
-			htmlpane = new HtmlPane(stylesheet);
+			htmlpane = new MdAdocHtmlPane(stylesheet);
 		JScrollPane scrollpane = new JScrollPane(htmlpane);
-		
-		htmlpane.addHyperlinkListener(this);
 
 		getContentPane().add(scrollpane,BorderLayout.CENTER);
 
@@ -177,43 +176,27 @@ private void doopen() {
 		chooser.addChoosableFileFilter(filter);
 		int ret = chooser.showOpenDialog(this);
 		if (ret == JFileChooser.APPROVE_OPTION) {
+			File file = chooser.getSelectedFile();
+				
 			try {
-				File file = chooser.getSelectedFile();
-				DocService service;
-				try {
-					service = DocServiceLoader.getInstance().getProviderForFile(file);
-				} catch (Exception e) {
-					String msg = MessageFormat.format("unable to find loader/parser for {0}", file.getName());
-					JOptionPane.showMessageDialog(this, msg,"Error", JOptionPane.ERROR_MESSAGE);
-					return;
-				}
-				if (service != null) {
-					htmlpane.setDocservice(service);
-					htmlpane.load(file);
-				} else {
-					String msg = MessageFormat.format("unable to find loader/parser for {0}", file.getName());
-					JOptionPane.showMessageDialog(this, msg,"Error", JOptionPane.ERROR_MESSAGE);
-				}
-
-			} catch (IOException e) {
-				JOptionPane.showMessageDialog(this, e.getMessage(),"Error", JOptionPane.ERROR_MESSAGE);
-			}
+				htmlpane.load(file);
+			} catch (Exception e) {
+				String msg = MessageFormat.format("unable load file {0}: {1}",
+					file.getName(), e.getMessage());
+				JOptionPane.showMessageDialog(this, msg,"Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}				
 			App.getInstance().setLastdir(chooser.getSelectedFile().getParent());
 		}
 	}
 
 	public void openfile(File file) {
-		DocService service = DocServiceLoader.getInstance().getProviderForFile(file);
-		if (service != null) {			
-			try {
-				htmlpane.setDocservice(service);
-				htmlpane.load(file);
-			} catch (IOException e) {
-				JOptionPane.showMessageDialog(this, e.getMessage(),"Error", JOptionPane.ERROR_MESSAGE);
-			}
-		} else {
-			String msg = MessageFormat.format("unable to find loader/parser for {0}", file.getName());
-			JOptionPane.showMessageDialog(this, msg,"Error", JOptionPane.ERROR_MESSAGE);
+		try {
+			htmlpane.load(file);
+		} catch (Exception e) {
+			String msg = MessageFormat.format("unable load file {0}: {1}",
+					file.getName(), e.getMessage());
+			JOptionPane.showMessageDialog(this, msg, "Error", JOptionPane.ERROR_MESSAGE);
 		}
 	}
 
@@ -337,23 +320,6 @@ private void doabout() {
 	}
 
 
-	@Override
-	public void hyperlinkUpdate(HyperlinkEvent e) {
-        if(e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-        	if(Desktop.isDesktopSupported()) {
-        		Open.open(e.getURL().toString());
-        		/*
-        	    try {        	    	
-					Desktop.getDesktop().browse(e.getURL().toURI());
-				} catch (IOException e1) {
-					e1.printStackTrace();
-				} catch (URISyntaxException e1) {
-					e1.printStackTrace();
-				}
-				*/
-        	}
-         }		
-	}
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
@@ -363,7 +329,7 @@ public void actionPerformed(ActionEvent e) {
 		} else if(cmd.equals("RELOAD")) {
 			try {
 				htmlpane.reload();
-			} catch (IOException e1) {
+			} catch (Exception e1) {
 				JOptionPane.showMessageDialog(this, e1.getMessage(),"Error", JOptionPane.ERROR_MESSAGE);
 			}		
 		} else if(cmd.equals("ABOUT")) {			
@@ -379,16 +345,16 @@ public void actionPerformed(ActionEvent e) {
 			htmlpane.setStyleSheet(url);
 			try {
 				htmlpane.reload();
-			} catch (IOException e1) {
-				log.error(e1.getMessage());
+			} catch (Exception e2) {
+				log.error(e2.getMessage());
 			}
 		} else if(cmd.equals("DARK")) {
 			URL url = App.class.getResource("github-dark.css");
 			htmlpane.setStyleSheet(url);
 			try {
 				htmlpane.reload();
-			} catch (IOException e1) {
-				log.error(e1.getMessage());
+			} catch (Exception e3) {
+				log.error(e3.getMessage());
 			}
 		} else if(cmd.equals("PRINT")) {
 			doprint();

mdadocviewer/src/main/java/org/jmarkdownviewer/jmdviewer/MdAdocHtmlPane.java

@@ -0,0 +1,55 @@
+package org.jmarkdownviewer.jmdviewer;
+
+import java.net.URL;
+
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
+import javax.swing.text.html.HTMLEditorKit;
+
+import org.jmarkdownviewer.viewer.HtmlPane;
+
+public class MdAdocHtmlPane extends HtmlPane {	
+	
+	public MdAdocHtmlPane() {
+		super();
+	}
+
+	public MdAdocHtmlPane(URL url) {
+		super(url);
+	}
+
+	@Override
+	protected void createPane(URL cssurl) {
+		super.createPane(cssurl);
+		
+		//HTMLEditorKit kit = (HTMLEditorKit) getEditorKit();
+		
+		String imgsrc = App.class.getResource("markdown.png").toString();
+		String imgsrcadoc = App.class.getResource("AsciiDoc-color.png").toString();
+		
+		// create some simple html as a string
+		
+		StringBuilder sb = new StringBuilder(256);
+		sb.append("<html>\n");
+		sb.append("<body>\n");		
+		sb.append("<h1>");
+		sb.append("<img src=\"");
+		sb.append(imgsrc);
+		sb.append("\">");
+		sb.append("&nbsp; Markdown ");
+		sb.append("&amp; ");
+		sb.append("<img src=\"");
+		sb.append(imgsrcadoc);
+		sb.append("\">");
+		sb.append("&nbsp; AsciiDoc ");
+		sb.append("Viewer</h1>\n");
+		sb.append("<h2>Select a file</h2>\n");
+		sb.append("<p>This is some sample text</p>\n");
+		sb.append("</body>\n");
+		sb.append("</html>");
+		
+		setText(sb.toString());
+
+	}
+
+}