Changeset 1303

Show
Ignore:
Timestamp:
11/13/07 13:17:34 (1 year ago)
Author:
koshi
Message:

#206 fixed bug and organized code.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.feature/feature.xml

    r1291 r1303  
    33      id="org.jalcedo.tools.icon.manager.feature" 
    44      label="%featureName" 
    5       version="0.0.1.v20071107" 
     5      version="0.0.1.v20071113" 
    66      provider-name="%providerName"> 
    77 

  • org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/META-INF/MANIFEST.MF

    r1290 r1303  
    33Bundle-Name: %plugin.name 
    44Bundle-SymbolicName: org.jalcedo.tools.icon.manager.ui;singleton:=true 
    5 Bundle-Version: 0.0.1.v20071109 
     5Bundle-Version: 0.0.1.v20071113 
    66Bundle-Activator: org.jalcedo.tools.icon.manager.ui.Activator 
    77Require-Bundle: org.eclipse.ui, 

  • org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/property/IconPropertyPage.java

    r1297 r1303  
    219219            Bundle bundle = Activator.getDefault().getBundle(); 
    220220            imageKeysModel = new IImageKeysModel(bundle, DEFAULT_CLASS,  
    221                     project.getElementName()+DEFAULT_PACKAGE, root, DEFAULT_ICON_DIR); 
     221                    project.getElementName().toLowerCase()+DEFAULT_PACKAGE, root, DEFAULT_ICON_DIR); 
    222222            iconListViewer.setInput(imageKeysModel.getList()); 
    223223        } catch (JavaModelException e) { 

  • org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/wizard/EditIconWizardPage.java

    r1299 r1303  
    5454import org.eclipse.swt.events.SelectionEvent; 
    5555import org.eclipse.swt.graphics.Image; 
    56 import org.eclipse.swt.graphics.Point; 
    5756import org.eclipse.swt.layout.GridData; 
    5857import org.eclipse.swt.layout.GridLayout; 
    …… 
    6564import org.eclipse.swt.widgets.Text; 
    6665import org.eclipse.ui.plugin.AbstractUIPlugin; 
     66import org.jalcedo.tools.icon.manager.model.CategorizedIcons; 
     67import org.jalcedo.tools.icon.manager.model.Icon; 
    6768import org.jalcedo.tools.icon.manager.ui.Activator; 
    6869import org.jalcedo.tools.icon.manager.ui.internal.resource.IconUtil; 
    6970import org.jalcedo.tools.icon.manager.ui.internal.resource.Messages; 
    70 import org.jalcedo.tools.icon.manager.model.CategorizedIcons; 
    71 import org.jalcedo.tools.icon.manager.model.Icon; 
    7271 
    7372/** 
    …… 
    454453     
    455454    private class ImportListLabelProvider extends LabelProvider{ 
    456         private ImageRegistry imageRegistry = Activator.getDefault().getImageRegistry(); 
    457455        public String getText(Object element) { 
    458456            if(element instanceof Icon){ 
    …… 
    465463            if(element instanceof Icon){ 
    466464                Icon icon = (Icon) element; 
    467                 if(imageRegistry.get(icon.getPath()) == null){ 
    468                     ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin( 
    469                             Activator.PLUGIN_ID, icon.getPath()); 
    470                     if(imageDescriptor.getImageData() != null){ 
    471                         imageRegistry.put(icon.getPath(), ImageDescriptor.createFromImageData( 
    472                                 imageDescriptor.getImageData().scaledTo(16,16))); 
    473                     }else{ 
    474                         imageRegistry.put(icon.getPath(), imageDescriptor); 
    475                     } 
    476                 } 
    477                 return imageRegistry.get(icon.getPath()); 
     465                return Activator.getDefault().getImageRegistry().get(icon.getPath()); 
    478466            } 
    479467            return super.getImage(element);