Commits

eryzhikov  committed 1167c60

Make IconFontPack an abstract implementation instead of interface

  • Participants
  • Parent commits 3dc2d66
  • Tags 8.0.2-dev-preview-2

Comments (0)

Files changed (3)

File src/main/java/org/controlsfx/iconfont/AbstractIconFontPack.java

-/**
- * Copyright (c) 2013, ControlsFX
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *     * Neither the name of ControlsFX, any associated website, nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL CONTROLSFX BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.controlsfx.iconfont;
-
-import java.io.InputStream;
-
-public abstract class AbstractIconFontPack implements IconFontPack {
-
-	private final String fontName;
-	private final IconFont font;
-	
-	public AbstractIconFontPack(String fontName, InputStream in) {
-		this.fontName = fontName;
-		this.font = new IconFont(fontName, in);
-	}
-
-	public AbstractIconFontPack( String fontName, String urlStr ) { 
-		this.fontName = fontName;
-		this.font = new IconFont(fontName, urlStr);
-	} 
-
-
-	@Override
-	public String getFontName() {
-		return fontName;
-	}
-
-	@Override
-	public IconFont getFont() {
-		return font;
-	}
-
-}

File src/main/java/org/controlsfx/iconfont/IconFontPack.java

  */
 package org.controlsfx.iconfont;
 
+import java.io.InputStream;
 import java.util.Map;
 
-public interface IconFontPack {
-	String getFontName();
-	IconFont getFont();
-	Map<String,Character> getGlyphs();
-}
+public abstract class IconFontPack  {
+
+	private final String fontName;
+	private final IconFont font;
+	
+	public IconFontPack(String fontName, InputStream in) {
+		this.fontName = fontName;
+		this.font = new IconFont(fontName, in);
+	}
+
+	public IconFontPack( String fontName, String urlStr ) { 
+		this.fontName = fontName;
+		this.font = new IconFont(fontName, urlStr);
+	} 
+
+
+	public String getFontName() {
+		return fontName;
+	}
+
+	public IconFont getFont() {
+		return font;
+	}
+
+	public abstract Map<String, Character> getGlyphs();
+
+}

File src/main/java/org/controlsfx/iconfont/pack/FontAwesomePack.java

 
 import javafx.scene.Node;
 
-import org.controlsfx.iconfont.AbstractIconFontPack;
+import org.controlsfx.iconfont.IconFontPack;
 import org.controlsfx.iconfont.IconFontRegistry;
 
-public class FontAwesomePack extends  AbstractIconFontPack {
+public class FontAwesomePack extends  IconFontPack {
 
 	private static String fontName = "FontAwesome";