Merge pull request atarw#91 from vinceh121/master

vincenzopalazzo · web-flow · commit 09bf58406de5 · 2019-11-16T10:41:46.000+01:00
Added checking for null rendering hints
diff --git a/src/main/java/mdlaf/utils/MaterialDrawingUtils.java b/src/main/java/mdlaf/utils/MaterialDrawingUtils.java
@@ -8,23 +8,27 @@
 
 public class MaterialDrawingUtils {
 
-	static {
-		System.setProperty ("awt.useSystemAAFontSettings", "on");
-		System.setProperty ("swing.aatext", "true");
-		System.setProperty ("sun.java2d.xrender", "true");
-	}
+    static {
+        System.setProperty("awt.useSystemAAFontSettings", "on");
+        System.setProperty("swing.aatext", "true");
+        System.setProperty("sun.java2d.xrender", "true");
+    }
 
-	public static Graphics getAliasedGraphics (Graphics g) {
-		Map<RenderingHints.Key, Object> hints = (Map<RenderingHints.Key, Object>) Toolkit.getDefaultToolkit ().getDesktopProperty ("awt.font.desktophints");
+    public static Graphics getAliasedGraphics(Graphics g) {
+        Map<RenderingHints.Key, Object> hints = (Map<RenderingHints.Key, Object>) Toolkit.getDefaultToolkit ().getDesktopProperty ("awt.font.desktophints");
 
-		hints.put (RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-		hints.put(RenderingHints.KEY_RENDERING,	RenderingHints.VALUE_RENDER_DEFAULT);
-		hints.put(RenderingHints.KEY_COLOR_RENDERING,	RenderingHints.VALUE_COLOR_RENDER_DEFAULT);
-		hints.put(RenderingHints.KEY_TEXT_ANTIALIASING,	RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
+		if(hints != null){
+			hints.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+			hints.put(RenderingHints.KEY_RENDERING,	RenderingHints.VALUE_RENDER_DEFAULT);
+			hints.put(RenderingHints.KEY_COLOR_RENDERING,	RenderingHints.VALUE_COLOR_RENDER_DEFAULT);
+			hints.put(RenderingHints.KEY_TEXT_ANTIALIASING,	RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
 
-		Graphics2D g2d = (Graphics2D) g;
-		g2d.addRenderingHints(hints);
+			Graphics2D g2d = (Graphics2D) g;
+			g2d.addRenderingHints(hints);
+			return g2d;
+		}
+		
 		//g2d.addRenderingHints (new RenderingHints (RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON));
-		return g2d;
-	}
+		return g;
+    }
 }
