projects/dwt-addons: dwtx/jface/resource/FontRegistry.d comparison

comparison dwtx/jface/resource/FontRegistry.d @ 104:04b47443bb01

Reworked the collection uses to make use of a wrapper collection that is compatible to the Java Collections. These new wrappers now use the tango.util.containers instead of the tango.util.collections.

author	Frank Benoit <benoit@tionex.de>
date	Thu, 07 Aug 2008 15:01:33 +0200
parents	7ffeace6c47f
children	e4589de2eed6

comparison

equal deleted inserted replaced

-:2d6540440fe6
+:04b47443bb01
 import dwtx.jface.resource.FontDescriptor;
 import dwtx.jface.resource.StringConverter;
 import dwtx.jface.resource.JFaceResources;
 import dwtx.jface.resource.DataFormatException;
-import tango.util.collection.ArraySeq;
 import dwtx.dwtxhelper.JHashMap;
-import tango.util.collection.model.Map;
-import tango.util.collection.model.Seq;
-import tango.util.collection.model.Set;
-import tango.util.collection.model.SetView;
-import tango.util.collection.HashSet;
 // import java.util.Arrays;
 // import java.util.Collections;
 // import java.util.Enumeration;
 // import java.util.HashMap;
 // import java.util.Iterator;
 import dwt.widgets.Shell;
 import dwtx.core.runtime.Assert;
 import dwt.dwthelper.ResourceBundle;
 import dwt.dwthelper.utils;
+import dwtx.dwtxhelper.Collection;
 import dwt.dwthelper.Runnable;
 version(Windows) import dwt.internal.win32.OS;
 /**
 * A font registry maintains a mapping between symbolic font names
 */
 void addAllocatedFontsToStale(Font defaultFont) {
 //Return all of the fonts allocated by the receiver.
 //if any of them are the defaultFont then don't bother.
 if (defaultFont !is baseFont && baseFont !is null) {
-staleFonts.append(baseFont);
+staleFonts.add(baseFont);
 }
 if (defaultFont !is boldFont && boldFont !is null) {
-staleFonts.append(boldFont);
+staleFonts.add(boldFont);
 }
 if (defaultFont !is italicFont && italicFont !is null) {
-staleFonts.append(italicFont);
+staleFonts.add(italicFont);
 }
 }
 }
 /**
 * Table of known fonts, keyed by symbolic font name
 * (key type: <code>String</code>,
 *  value type: <code>FontRecord</code>.
 */
-private JHashMapT!(String,FontRecord) stringToFontRecord;
+private Map stringToFontRecord;
 /**
 * Table of known font data, keyed by symbolic font name
 * (key type: <code>String</code>,
 *  value type: <code>dwt.graphics.FontData[]</code>).
 */
-private JHashMapT!(String,FontData[]) stringToFontData;
+private Map stringToFontData;
 /**
 * Collection of Fonts that are now stale to be disposed
 * when it is safe to do so (i.e. on shutdown).
 * @see List
 */
-private Seq!(Font) staleFonts;
+private List staleFonts;
 /**
 * Runnable that cleans up the manager on disposal of the display.
 */
 protected Runnable displayRunnable;
 displayRunnable = new class Runnable {
 public void run() {
 clearCaches();
 }
 };
-stringToFontRecord = new JHashMapT!(String,FontRecord);
+stringToFontRecord = new HashMap(7);
-//stringToFontRecord.capacity(7);
+stringToFontData = new HashMap(7);
+staleFonts = new ArrayList();
-stringToFontData = new JHashMapT!(String,FontData[]);
-//stringToFontData.capacity(7);
-staleFonts = new ArraySeq!(Font);
 }
 /**
 * Load the FontRegistry using the ClassLoader from the PlatformUI
 * plug-in
 * @param display the display to check against
 * @return the list of fonts that have been found on this system
 * @since 3.1
 */
 public FontData [] filterData(FontData [] fonts, Display display) {
-ArraySeq!(FontData) good = new ArraySeq!(FontData);
+ArrayList good = new ArrayList(fonts.length);
-good.capacity(fonts.length);
 for (int i = 0; i < fonts.length; i++) {
 FontData fd = fonts[i];
 if (fd is null) {
 continue;
 }
 FontData[] fixedFonts = display.getFontList(fd.getName(), false);
 if (isFixedFont(fixedFonts, fd)) {
-good.append(fd);
+good.add(fd);
 }
 FontData[] scalableFonts = display.getFontList(fd.getName(), true);
 if (scalableFonts.length > 0) {
-good.append(fd);
+good.add(fd);
 }
 }
 //None of the provided datas are valid. Return the
 //first one as it is at least the first choice.
-if (good.drained() && fonts.length > 0) {
+if (good.isEmpty() && fonts.length > 0) {
-good.append(fonts[0]);
+good.add(fonts[0]);
 }
 else if (fonts.length is 0) {
 return null;
 }
-return good.toArray();
+return arraycast!(FontData)(good.toArray());
 }
 /**
 * Creates a new font with the given font datas or <code>null</code>
 /**
 * Returns the default font record.
 */
 private FontRecord defaultFontRecord() {
-FontRecord record = cast(FontRecord) stringToFontRecord.find(JFaceResources.DEFAULT_FONT);
+FontRecord record = cast(FontRecord) stringToFontRecord
+.get(JFaceResources.DEFAULT_FONT);
 if (record is null) {
 Font defaultFont = calculateDefaultFont();
 record = createFont(JFaceResources.DEFAULT_FONT, defaultFont
 .getFontData());
 defaultFont.dispose();
-stringToFontRecord.add(JFaceResources.DEFAULT_FONT, record);
+stringToFontRecord.put(stringcast(JFaceResources.DEFAULT_FONT), record);
 }
 return record;
 }
 /**
 * @return the font
 */
 public FontData[] getFontData(String symbolicName) {
 Assert.isTrue(symbolicName.length > 0);
-auto result = stringToFontData.find(symbolicName);
+Object result = stringToFontData.get(symbolicName);
-if (result.length is 0) {
+if (result is null) {
 return defaultFontData();
 }
-return result;
+return arrayFromObject!(FontData)(result);
 }
 /**
 * Returns the font associated with the given symbolic font name.
 * Returns the default font if there is no special value associated
 * @param symbolicName The key for the record.
 * @return FontRecird
 */
 private FontRecord getFontRecord(String symbolicName) {
 Assert.isNotNull(symbolicName);
-auto result1 = stringToFontRecord.find(symbolicName);
+auto result = stringToFontRecord.get(symbolicName);
-if (result1 !is null) {
+if (result !is null) {
-return cast(FontRecord) result1;
+return cast(FontRecord) result;
 }
-auto result = stringToFontData.find(symbolicName);
+result = stringToFontData.get(symbolicName);
 FontRecord fontRecord;
 if (result is null) {
 fontRecord = defaultFontRecord();
 } else {
-fontRecord = createFont(symbolicName, result);
+fontRecord = createFont(symbolicName, arrayFromObject!(FontData)(result));
 }
 if (fontRecord is null) {
 fontRecord = defaultFontRecord();
 }
-stringToFontRecord.add(symbolicName.dup, fontRecord);
+stringToFontRecord.put(symbolicName.dup, fontRecord);
 return fontRecord;
 }
 /* (non-Javadoc)
 * @see dwtx.jface.resource.ResourceRegistry#getKeySet()
 */
-public override SetView!(String) getKeySet() {
+public override Set getKeySet() {
-auto res = new HashSet!(String);
+return Collections.unmodifiableSet(stringToFontData.keySet());
-foreach( k, v; stringToFontData ){
-res.add( k );
-}
-return res;
 }
 /* (non-Javadoc)
 * @see dwtx.jface.resource.ResourceRegistry#hasValueFor(java.lang.String)
 */
 /* (non-Javadoc)
 * @see dwtx.jface.resource.ResourceRegistry#clearCaches()
 */
 protected override void clearCaches() {
-foreach( k,v; stringToFontRecord ){
-v.dispose();
+Iterator iterator = stringToFontRecord.values().iterator();
-}
+while (iterator.hasNext()) {
-foreach( fnt; staleFonts.toArray ){
+Object next = iterator.next();
-fnt.dispose();
+(cast(FontRecord) next).dispose();
 }
+disposeFonts(staleFonts.iterator());
 stringToFontRecord.clear();
 staleFonts.clear();
 displayDisposeHooked = false;
+}
+/**
+* Dispose of all of the fonts in this iterator.
+* @param iterator over Collection of Font
+*/
+private void disposeFonts(Iterator iterator) {
+while (iterator.hasNext()) {
+Object next = iterator.next();
+(cast(Font) next).dispose();
+}
 }
 /**
 * Hook a dispose listener on the DWT display.
 */
 private void put(String symbolicName, FontData[] fontData, bool update) {
 Assert.isNotNull(symbolicName);
 Assert.isTrue(fontData.length > 0 );
-FontData[] existing = stringToFontData.find(symbolicName);
+FontData[] existing = arrayFromObject!(FontData)( stringToFontData.get(stringcast(symbolicName)));
 if (ArrayEquals(existing, fontData)) {
 return;
 }
-FontRecord oldFont = stringToFontRecord.find(symbolicName);
+FontRecord oldFont = cast(FontRecord) stringToFontRecord.remove(stringcast(symbolicName));
-stringToFontRecord.removeKey(symbolicName);
+stringToFontData.put(symbolicName.dup, new ArrayWrapperObject(fontData));
-stringToFontData.add(symbolicName.dup, fontData);
 if (update) {
-fireMappingChanged(symbolicName, new ArrayWrapperT!(FontData)(existing), new ArrayWrapperT!(FontData)(fontData));
+fireMappingChanged(symbolicName, new ArrayWrapperT!(FontData)(existing), new ArrayWrapperObject(arraycast!(Object)(fontData)));
 }
 if (oldFont !is null) {
 oldFont.addAllocatedFontsToStale(defaultFontRecord().getBaseFont());
 }
 * Reads the resource bundle.  This puts FontData[] objects
 * in the mapping table.  These will lazily be turned into
 * real Font objects when requested.
 */
 private void readResourceBundle(ResourceBundle bundle, String bundleName) {
-foreach( key; bundle.getKeys() ){
+auto keys = bundle.getKeys();
+foreach ( key; keys ) {
 int pos = key.lastIndexOf('.');
 if (pos is -1) {
-stringToFontData.add(key.dup, [ makeFontData(bundle.getString(key)) ]);
+stringToFontData.put(stringcast(key.dup), new ArrayWrapperObject(arraycast!(Object)([ makeFontData(bundle
+.getString(key)) ])));
 } else {
 String name = key.substring(0, pos);
 int i = 0;
 try {
 i = tango.text.convert.Integer.toInt(key.substring(pos + 1));
 } catch (IllegalArgumentException e) {
 //Panic the file can not be parsed.
 throw new MissingResourceException(
 "Wrong key format ", bundleName, key); //$NON-NLS-1$
 }
-FontData[] elements = stringToFontData.find(name);
+FontData[] elements = arrayFromObject!(FontData)( stringToFontData.get(stringcast(name)));
 if (elements is null) {
 elements = new FontData[8];
-stringToFontData.add(name.dup, elements);
+stringToFontData.put(name.dup, new ArrayWrapperObject(elements));
 }
 if (i > elements.length) {
 FontData[] na = new FontData[i + 8];
 System.arraycopy(elements, 0, na, 0, elements.length);
 elements = na;
-stringToFontData.add(name.dup, elements);
+stringToFontData.put(name.dup, new ArrayWrapperObject(elements));
 }
 elements[i] = makeFontData(bundle.getString(key));
 }
 }
 }

Mercurial > projects > dwt-addons

comparison dwtx/jface/resource/FontRegistry.d @ 104:04b47443bb01