Skip to content

Commit 1d44cdb

Browse files
author
atarw
committed
mavenized project
1 parent e147f09 commit 1d44cdb

File tree

118 files changed

+357
-239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+357
-239
lines changed

‎.idea/artifacts/material_ui_swing_jar.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/compiler.xml

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/workspace.xml

Lines changed: 200 additions & 162 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎material-ui-swing.iml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="true">
4-
<exclude-output />
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
56
<content url="file://$MODULE_DIR$">
6-
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10+
<excludeFolder url="file://$MODULE_DIR$/target" />
711
</content>
812
<orderEntry type="inheritedJdk" />
913
<orderEntry type="sourceFolder" forTests="false" />

‎pom.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>com.mdlaf</groupId>
8+
<artifactId>material-ui-swing</artifactId>
9+
<version>1.0-SNAPSHOT</version>
10+
11+
<build>
12+
<plugins>
13+
<plugin>
14+
<groupId>org.apache.maven.plugins</groupId>
15+
<artifactId>maven-compiler-plugin</artifactId>
16+
<configuration>
17+
<source>1.8</source>
18+
<target>1.8</target>
19+
</configuration>
20+
</plugin>
21+
</plugins>
22+
<resources>
23+
<resource>
24+
<directory>src/main/resources</directory>
25+
</resource>
26+
</resources>
27+
</build>
28+
</project>

‎src/MaterialUISwingDemo.java renamed to ‎src/main/java/MaterialUISwingDemo.java

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,44 @@
11
import mdlaf.MaterialLookAndFeel;
22
import mdlaf.animation.MaterialUIMovement;
3-
import mdlaf.resources.MaterialColors;
4-
5-
import javax.swing.*;
6-
import javax.swing.event.ListDataListener;
3+
import mdlaf.utils.MaterialColors;
4+
5+
import javax.swing.AbstractAction;
6+
import javax.swing.Action;
7+
import javax.swing.JButton;
8+
import javax.swing.JCheckBox;
9+
import javax.swing.JCheckBoxMenuItem;
10+
import javax.swing.JColorChooser;
11+
import javax.swing.JComboBox;
12+
import javax.swing.JDialog;
13+
import javax.swing.JEditorPane;
14+
import javax.swing.JFileChooser;
15+
import javax.swing.JFrame;
16+
import javax.swing.JLabel;
17+
import javax.swing.JMenu;
18+
import javax.swing.JMenuBar;
19+
import javax.swing.JMenuItem;
20+
import javax.swing.JPanel;
21+
import javax.swing.JPasswordField;
22+
import javax.swing.JProgressBar;
23+
import javax.swing.JRadioButton;
24+
import javax.swing.JRadioButtonMenuItem;
25+
import javax.swing.JScrollPane;
26+
import javax.swing.JSlider;
27+
import javax.swing.JSpinner;
28+
import javax.swing.JTabbedPane;
29+
import javax.swing.JTable;
30+
import javax.swing.JTextField;
31+
import javax.swing.JTextPane;
32+
import javax.swing.JToggleButton;
33+
import javax.swing.JToolBar;
34+
import javax.swing.JTree;
35+
import javax.swing.SpinnerListModel;
36+
import javax.swing.UIManager;
37+
import javax.swing.UnsupportedLookAndFeelException;
738
import java.awt.BorderLayout;
839
import java.awt.Color;
940
import java.awt.Dimension;
1041
import java.awt.event.ActionEvent;
11-
import java.util.ArrayList;
12-
import java.util.List;
1342

1443
public class MaterialUISwingDemo {
1544

@@ -88,25 +117,25 @@ public static void main (String[] args) {
88117

89118
JToolBar tb = new JToolBar ("toolbar");
90119
JButton button1 = new JButton ("f");
91-
class ActionTest extends AbstractAction{
120+
class ActionTest extends AbstractAction {
92121

93-
public ActionTest(){
94-
putValue(Action.NAME, "f");
95-
putValue(Action.SHORT_DESCRIPTION, "Test tool tip");
122+
public ActionTest () {
123+
putValue (Action.NAME, "f");
124+
putValue (Action.SHORT_DESCRIPTION, "Test tool tip");
96125
}
97126

98127
@Override
99-
public void actionPerformed(ActionEvent e) {
100-
JDialog dialog = new JDialog();
101-
JPanel jPanel = new JPanel();
102-
jPanel.add(new JColorChooser());
103-
dialog.setContentPane(jPanel);
104-
dialog.setLocationRelativeTo(null);
105-
dialog.setVisible(true);
106-
dialog.pack();
128+
public void actionPerformed (ActionEvent e) {
129+
JDialog dialog = new JDialog ();
130+
JPanel jPanel = new JPanel ();
131+
jPanel.add (new JColorChooser ());
132+
dialog.setContentPane (jPanel);
133+
dialog.setLocationRelativeTo (null);
134+
dialog.setVisible (true);
135+
dialog.pack ();
107136
}
108137
}
109-
button1.setAction(new ActionTest());
138+
button1.setAction (new ActionTest ());
110139
JButton button2 = new JButton ("e");
111140
button1.setBackground (MaterialColors.LIGHT_BLUE_400);
112141
button1.setForeground (Color.WHITE);

‎src/mdlaf/MaterialLookAndFeel.java renamed to ‎src/main/java/mdlaf/MaterialLookAndFeel.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import mdlaf.components.button.MaterialButtonUI;
44
import mdlaf.components.checkbox.MaterialCheckBoxUI;
55
import mdlaf.components.checkboxmenuitem.MaterialCheckBoxMenuItemUI;
6-
import mdlaf.components.colorchooser.MaterialColorChooserUI;
76
import mdlaf.components.combobox.MaterialComboBoxUI;
87
import mdlaf.components.filechooser.MaterialFileChooserUI;
98
import mdlaf.components.label.MaterialLabelUI;
@@ -29,10 +28,10 @@
2928
import mdlaf.components.toolbar.MaterialToolBarUI;
3029
import mdlaf.components.tooltip.MaterialToolTipUI;
3130
import mdlaf.components.tree.MaterialTreeUI;
32-
import mdlaf.resources.MaterialBorders;
33-
import mdlaf.resources.MaterialColors;
34-
import mdlaf.resources.MaterialFonts;
35-
import mdlaf.resources.MaterialImages;
31+
import mdlaf.utils.MaterialBorders;
32+
import mdlaf.utils.MaterialColors;
33+
import mdlaf.utils.MaterialFonts;
34+
import mdlaf.utils.MaterialImages;
3635

3736
import javax.swing.BorderFactory;
3837
import javax.swing.ImageIcon;
@@ -71,8 +70,7 @@ public class MaterialLookAndFeel extends MetalLookAndFeel {
7170
private static final String editorPane = MaterialTextPaneUI.class.getCanonicalName ();
7271
private static final String separatorUI = MaterialSeparatorUI.class.getCanonicalName ();
7372
private static final String fileChooserUI = MaterialFileChooserUI.class.getCanonicalName ();
74-
private static final String toolTipUI = MaterialToolTipUI.class.getCanonicalName();
75-
private static final String colorChooser = MaterialColorChooserUI.class.getCanonicalName();
73+
private static final String toolTipUI = MaterialToolTipUI.class.getCanonicalName ();
7674

7775
@Override
7876
public String getName () {
@@ -131,7 +129,6 @@ protected void initClassDefaults (UIDefaults table) {
131129
table.put ("SeparatorUI", separatorUI);
132130
table.put ("FileChooserUI", fileChooserUI);
133131
table.put ("ToolTipUI", toolTipUI);
134-
table.put ("ColorChooserUI", colorChooser);
135132
}
136133

137134
@Override
@@ -316,11 +313,11 @@ protected void initComponentDefaults (UIDefaults table) {
316313
table.put ("Separator.background", MaterialColors.GRAY_300);
317314
table.put ("Separator.foreground", MaterialColors.GRAY_300);
318315

319-
table.put("ToolTip.background", MaterialColors.GRAY_500);
320-
table.put("ToolTip.foreground", MaterialColors.GRAY_50);
321-
table.put("ToolTip.border", BorderFactory.createEmptyBorder(5,5,5,5));
316+
table.put ("ToolTip.background", MaterialColors.GRAY_500);
317+
table.put ("ToolTip.foreground", MaterialColors.GRAY_50);
318+
table.put ("ToolTip.border", BorderFactory.createEmptyBorder (5, 5, 5, 5));
322319

323-
table.put("ColorChooser.background ", MaterialColors.WHITE);
324-
table.put("ColorChooser.foreground ", MaterialColors.BLACK);
320+
table.put ("ColorChooser.background ", MaterialColors.WHITE);
321+
table.put ("ColorChooser.foreground ", MaterialColors.BLACK);
325322
}
326323
}

‎src/mdlaf/animation/MaterialUIMovement.java renamed to ‎src/main/java/mdlaf/animation/MaterialUIMovement.java

File renamed without changes.

‎src/mdlaf/animation/MaterialUITimer.java renamed to ‎src/main/java/mdlaf/animation/MaterialUITimer.java

File renamed without changes.

0 commit comments

Comments
 (0)