Skip to content

Commit

Permalink
Source arrangement
Browse files Browse the repository at this point in the history
* normalize maven source structure: src/main/java is a root of sources
* .classpath includes access rule for javafx/** classes
  • Loading branch information
evg-tyurin committed Dec 23, 2017
1 parent 86f98df commit a61415c
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 28 deletions.
21 changes: 15 additions & 6 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
Expand All @@ -15,12 +9,27 @@
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
<accessrules>
<accessrule kind="accessible" pattern="javafx/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
2 changes: 2 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
encoding/resources=UTF-8
encoding/src=UTF-8
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<build>
<finalName>JavaFXWebBrowser-${project.version}</finalName>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>resources</directory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@
* and this list of conditions without modification.
*/

package main.java.com.goxr3plus.javafxwebbrowser.application;
package com.goxr3plus.JavaFXWebBrowser.application;

import com.goxr3plus.JavaFXWebBrowser.browser.WebBrowserController;
import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;

import javafx.application.Application;
import javafx.scene.Scene;
import javafx.scene.layout.BorderPane;
import javafx.stage.Screen;
import javafx.stage.Stage;
import main.java.com.goxr3plus.javafxwebbrowser.browser.WebBrowserController;
import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;

/**
* From here you start the application
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*
*/
package main.java.com.goxr3plus.javafxwebbrowser.browser;
package com.goxr3plus.JavaFXWebBrowser.browser;

import java.util.List;
import java.util.SortedSet;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* TODO LISENSE
*/
package main.java.com.goxr3plus.javafxwebbrowser.browser;
package com.goxr3plus.JavaFXWebBrowser.browser;

import java.io.IOException;
import java.util.Arrays;
Expand All @@ -11,14 +11,14 @@
import java.util.logging.Logger;
import java.util.stream.Collectors;

import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;
import com.jfoenix.controls.JFXButton;

import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import javafx.scene.layout.StackPane;
import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;

/**
* @author GOXR3PLUS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package main.java.com.goxr3plus.javafxwebbrowser.browser;
package com.goxr3plus.JavaFXWebBrowser.browser;

import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;

import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;

import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.MenuItem;
import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;

public class WebBrowserTabContextMenu extends ContextMenu {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
*
*/
package main.java.com.goxr3plus.javafxwebbrowser.browser;
package com.goxr3plus.JavaFXWebBrowser.browser;

import java.awt.image.BufferedImage;
import java.io.IOException;
Expand All @@ -15,6 +15,8 @@

import org.apache.commons.validator.routines.UrlValidator;

import com.goxr3plus.JavaFXWebBrowser.marquee.Marquee;
import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;
import com.jfoenix.controls.JFXButton;

import javafx.application.Platform;
Expand Down Expand Up @@ -43,8 +45,6 @@
import javafx.scene.web.WebHistory;
import javafx.scene.web.WebHistory.Entry;
import javafx.scene.web.WebView;
import main.java.com.goxr3plus.javafxwebbrowser.marquee.Marquee;
import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;
import net.sf.image4j.codec.ico.ICODecoder;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package main.java.com.goxr3plus.javafxwebbrowser.marquee;
package com.goxr3plus.JavaFXWebBrowser.marquee;

import java.io.IOException;

import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;

import javafx.animation.Animation;
import javafx.animation.KeyFrame;
import javafx.animation.Timeline;
Expand All @@ -15,7 +17,6 @@
import javafx.scene.shape.Rectangle;
import javafx.scene.text.Text;
import javafx.util.Duration;
import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;

/**
* When the screen element is not big enough to show the text then an animation will start automatically
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.goxr3plus.JavaFXWebBrowser.settings;

//TODO
public class SettingsWindow {

}
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
/*
*
*/
package main.java.com.goxr3plus.javafxwebbrowser.tools;
package com.goxr3plus.JavaFXWebBrowser.tools;

import java.io.File;
import java.net.URISyntaxException;
import java.util.logging.Level;
import java.util.logging.Logger;

import com.goxr3plus.JavaFXWebBrowser.application.Main;

import javafx.scene.image.Image;
import main.java.com.goxr3plus.javafxwebbrowser.application.Main;

/**
* Provides useful methods for retrieving informations.
Expand Down

This file was deleted.

0 comments on commit a61415c

Please sign in to comment.