mavenized project

material-ui-swing.iml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.mdlaf</groupId>
+    <artifactId>material-ui-swing</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>

src/MaterialUISwingDemo.java → src/main/java/MaterialUISwingDemo.java

@@ -1,15 +1,44 @@
 import mdlaf.MaterialLookAndFeel;
 import mdlaf.animation.MaterialUIMovement;
-import mdlaf.resources.MaterialColors;
-
-import javax.swing.*;
-import javax.swing.event.ListDataListener;
+import mdlaf.utils.MaterialColors;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JColorChooser;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JProgressBar;
+import javax.swing.JRadioButton;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JScrollPane;
+import javax.swing.JSlider;
+import javax.swing.JSpinner;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.JToggleButton;
+import javax.swing.JToolBar;
+import javax.swing.JTree;
+import javax.swing.SpinnerListModel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
 
 public class MaterialUISwingDemo {
 
@@ -88,25 +117,25 @@ public static void main (String[] args) {
 
 		JToolBar tb = new JToolBar ("toolbar");
 		JButton button1 = new JButton ("f");
-		class ActionTest extends AbstractAction{
+		class ActionTest extends AbstractAction {
 
-			public ActionTest(){
-				putValue(Action.NAME, "f");
-				putValue(Action.SHORT_DESCRIPTION, "Test tool tip");
+			public ActionTest () {
+				putValue (Action.NAME, "f");
+				putValue (Action.SHORT_DESCRIPTION, "Test tool tip");
 			}
 
 			@Override
-			public void actionPerformed(ActionEvent e) {
-				JDialog dialog = new JDialog();
-				JPanel jPanel = new JPanel();
-				jPanel.add(new JColorChooser());
-				dialog.setContentPane(jPanel);
-				dialog.setLocationRelativeTo(null);
-				dialog.setVisible(true);
-				dialog.pack();
+			public void actionPerformed (ActionEvent e) {
+				JDialog dialog = new JDialog ();
+				JPanel jPanel = new JPanel ();
+				jPanel.add (new JColorChooser ());
+				dialog.setContentPane (jPanel);
+				dialog.setLocationRelativeTo (null);
+				dialog.setVisible (true);
+				dialog.pack ();
 			}
 		}
-		button1.setAction(new ActionTest());
+		button1.setAction (new ActionTest ());
 		JButton button2 = new JButton ("e");
 		button1.setBackground (MaterialColors.LIGHT_BLUE_400);
 		button1.setForeground (Color.WHITE);

src/mdlaf/MaterialLookAndFeel.java → src/main/java/mdlaf/MaterialLookAndFeel.java

@@ -3,7 +3,6 @@
 import mdlaf.components.button.MaterialButtonUI;
 import mdlaf.components.checkbox.MaterialCheckBoxUI;
 import mdlaf.components.checkboxmenuitem.MaterialCheckBoxMenuItemUI;
-import mdlaf.components.colorchooser.MaterialColorChooserUI;
 import mdlaf.components.combobox.MaterialComboBoxUI;
 import mdlaf.components.filechooser.MaterialFileChooserUI;
 import mdlaf.components.label.MaterialLabelUI;
@@ -29,10 +28,10 @@
 import mdlaf.components.toolbar.MaterialToolBarUI;
 import mdlaf.components.tooltip.MaterialToolTipUI;
 import mdlaf.components.tree.MaterialTreeUI;
-import mdlaf.resources.MaterialBorders;
-import mdlaf.resources.MaterialColors;
-import mdlaf.resources.MaterialFonts;
-import mdlaf.resources.MaterialImages;
+import mdlaf.utils.MaterialBorders;
+import mdlaf.utils.MaterialColors;
+import mdlaf.utils.MaterialFonts;
+import mdlaf.utils.MaterialImages;
 
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
@@ -71,8 +70,7 @@ public class MaterialLookAndFeel extends MetalLookAndFeel {
 	private static final String editorPane = MaterialTextPaneUI.class.getCanonicalName ();
 	private static final String separatorUI = MaterialSeparatorUI.class.getCanonicalName ();
 	private static final String fileChooserUI = MaterialFileChooserUI.class.getCanonicalName ();
-	private static final String toolTipUI = MaterialToolTipUI.class.getCanonicalName();
-	private static final String colorChooser = MaterialColorChooserUI.class.getCanonicalName();
+	private static final String toolTipUI = MaterialToolTipUI.class.getCanonicalName ();
 
 	@Override
 	public String getName () {
@@ -131,7 +129,6 @@ protected void initClassDefaults (UIDefaults table) {
 		table.put ("SeparatorUI", separatorUI);
 		table.put ("FileChooserUI", fileChooserUI);
 		table.put ("ToolTipUI", toolTipUI);
-		table.put ("ColorChooserUI", colorChooser);
 	}
 
 	@Override
@@ -316,11 +313,11 @@ protected void initComponentDefaults (UIDefaults table) {
 		table.put ("Separator.background", MaterialColors.GRAY_300);
 		table.put ("Separator.foreground", MaterialColors.GRAY_300);
 
-		table.put("ToolTip.background", MaterialColors.GRAY_500);
-		table.put("ToolTip.foreground", MaterialColors.GRAY_50);
-		table.put("ToolTip.border", BorderFactory.createEmptyBorder(5,5,5,5));
+		table.put ("ToolTip.background", MaterialColors.GRAY_500);
+		table.put ("ToolTip.foreground", MaterialColors.GRAY_50);
+		table.put ("ToolTip.border", BorderFactory.createEmptyBorder (5, 5, 5, 5));
 
-		table.put("ColorChooser.background ", MaterialColors.WHITE);
-		table.put("ColorChooser.foreground ", MaterialColors.BLACK);
+		table.put ("ColorChooser.background ", MaterialColors.WHITE);
+		table.put ("ColorChooser.foreground ", MaterialColors.BLACK);
 	}
 }

src/mdlaf/components/button/MaterialButtonUI.java → src/main/java/mdlaf/components/button/MaterialButtonUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.button;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;

src/mdlaf/components/checkbox/MaterialCheckBoxUI.java → src/main/java/mdlaf/components/checkbox/MaterialCheckBoxUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.checkbox;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;

src/mdlaf/components/checkboxmenuitem/MaterialCheckBoxMenuItemUI.java → src/main/java/mdlaf/components/checkboxmenuitem/MaterialCheckBoxMenuItemUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.checkboxmenuitem;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.Icon;
 import javax.swing.JCheckBoxMenuItem;

src/mdlaf/components/combobox/MaterialComboBoxUI.java → src/main/java/mdlaf/components/combobox/MaterialComboBoxUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.combobox;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;

src/mdlaf/components/filechooser/MaterialFileChooserUI.java → src/main/java/mdlaf/components/filechooser/MaterialFileChooserUI.java

@@ -1,7 +1,7 @@
 package mdlaf.components.filechooser;
 
-import mdlaf.resources.MaterialDrawingUtils;
-import mdlaf.resources.MaterialImages;
+import mdlaf.utils.MaterialDrawingUtils;
+import mdlaf.utils.MaterialImages;
 
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;

src/mdlaf/components/label/MaterialLabelUI.java → src/main/java/mdlaf/components/label/MaterialLabelUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.label;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;

src/mdlaf/components/menu/MaterialMenuUI.java → src/main/java/mdlaf/components/menu/MaterialMenuUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.menu;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JMenu;

src/mdlaf/components/menubar/MaterialMenuBarUI.java → src/main/java/mdlaf/components/menubar/MaterialMenuBarUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.menubar;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JMenuBar;

src/mdlaf/components/menuitem/MaterialMenuItemUI.java → src/main/java/mdlaf/components/menuitem/MaterialMenuItemUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.menuitem;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;

src/mdlaf/components/panel/MaterialPanelUI.java → src/main/java/mdlaf/components/panel/MaterialPanelUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.panel;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;

src/mdlaf/components/password/MaterialPasswordFieldUI.java → src/main/java/mdlaf/components/password/MaterialPasswordFieldUI.java

@@ -1,7 +1,7 @@
 package mdlaf.components.password;
 
-import mdlaf.resources.MaterialColors;
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialColors;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;

src/mdlaf/components/popupmenu/MaterialPopupMenuUI.java → src/main/java/mdlaf/components/popupmenu/MaterialPopupMenuUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.popupmenu;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JPopupMenu;

src/mdlaf/components/progressbar/MaterialProgressBarUI.java → src/main/java/mdlaf/components/progressbar/MaterialProgressBarUI.java

@@ -1,8 +1,8 @@
 package mdlaf.components.progressbar;
 
-import mdlaf.resources.MaterialBorders;
-import mdlaf.resources.MaterialColors;
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialBorders;
+import mdlaf.utils.MaterialColors;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JProgressBar;

src/mdlaf/components/radiobutton/MaterialRadioButtonUI.java → src/main/java/mdlaf/components/radiobutton/MaterialRadioButtonUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.radiobutton;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JRadioButton;

src/mdlaf/components/radiobuttonmenuitem/MaterialRadioButtonMenuItemUI.java → src/main/java/mdlaf/components/radiobuttonmenuitem/MaterialRadioButtonMenuItemUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.radiobuttonmenuitem;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.Icon;
 import javax.swing.JComponent;

src/mdlaf/components/scrollbar/MaterialScrollBarUI.java → src/main/java/mdlaf/components/scrollbar/MaterialScrollBarUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.scrollbar;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JButton;
 import javax.swing.JComponent;

src/mdlaf/components/separator/MaterialSeparatorUI.java → src/main/java/mdlaf/components/separator/MaterialSeparatorUI.java

@@ -1,6 +1,6 @@
 package mdlaf.components.separator;
 
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.plaf.ComponentUI;

src/mdlaf/components/slider/MaterialSliderUI.java → src/main/java/mdlaf/components/slider/MaterialSliderUI.java

@@ -1,7 +1,7 @@
 package mdlaf.components.slider;
 
-import mdlaf.resources.MaterialColors;
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialColors;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JSlider;

src/mdlaf/components/spinner/MaterialSpinnerUI.java → src/main/java/mdlaf/components/spinner/MaterialSpinnerUI.java

@@ -1,7 +1,7 @@
 package mdlaf.components.spinner;
 
 import mdlaf.components.textfield.MaterialTextFieldUI;
-import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.utils.MaterialDrawingUtils;
 
 import javax.swing.Icon;
 import javax.swing.JButton;