Merge remote-tracking branch 'origin/master'

vincenzopalazzo · vincenzopalazzo · commit cbfcdd1d603d · 2018-08-13T14:02:45.000+02:00
diff --git a/src/mdlaf/components/toolbar/MaterialToolBarUI.java b/src/mdlaf/components/toolbar/MaterialToolBarUI.java
@@ -1,41 +1,4 @@
 package mdlaf.components.toolbar;
-
-<<<<<<< refs/remotes/upstream/master
-import mdlaf.resources.MaterialDrawingUtils;
-
-import javax.swing.JComponent;
-import javax.swing.JToolBar;
-import javax.swing.UIManager;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.basic.BasicToolBarUI;
-import java.awt.Graphics;
-
-public class MaterialToolBarUI extends BasicToolBarUI {
-
-	public static ComponentUI createUI (JComponent c) {
-		return new MaterialToolBarUI ();
-	}
-
-	@Override
-	public void installUI (JComponent c) {
-		super.installUI (c);
-		JToolBar toolBar = (JToolBar) c;
-
-		toolBar.setFont (UIManager.getFont ("ToolBar.font"));
-		toolBar.setBackground (UIManager.getColor ("ToolBar.background"));
-		toolBar.setForeground (UIManager.getColor ("ToolBar.foreground"));
-		toolBar.setBorder (UIManager.getBorder ("ToolBar.border"));
-
-		this.dockingBorderColor = null;
-		this.floatingBorderColor = null;
-		this.dockingColor = UIManager.getColor ("ToolBar.dockingBackground");
-		this.floatingColor = UIManager.getColor ("ToolBar.floatingBackground");
-	}
-
-	@Override
-	public void paint (Graphics g, JComponent c) {
-		super.paint (MaterialDrawingUtils.getAliasedGraphics (g), c);
-=======
 import java.awt.Graphics;
 
 import javax.swing.BorderFactory;
@@ -86,6 +49,5 @@ public void installUI(JComponent c) {
 	@Override
 	public void paint(Graphics g, JComponent c) {
 		super.paint(MaterialDrawingUtils.getAliasedGraphics(g), c);
->>>>>>> Revert "github conflict resolution"
 	}
 }
