"smile" images problem solved

src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java

@@ -36,7 +36,7 @@ public SmiliesSelectorBox(ArrayList imageList) {
 		for (int i = 0; i < imageList.size(); i ++){
 			
 			Smily smily = (Smily)this.imageList.get(i);
-			
+						
 			MsgToolbarButton imageButton 
 								= new MsgToolbarButton(ImageLoader.getImage(smily.getImageID()));
 			

src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java

@@ -393,40 +393,40 @@ public static ArrayList getDefaultSmiliesPack() {
 
 		ArrayList defaultPackList = new ArrayList();
 
-		defaultPackList.add(new Smily(ImageLoader.SMILY1.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY1, 
 							new String[] { "$-)", "$)" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY2.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY2, 
 							new String[] { "8-)", "8)" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY3.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY3, 
 							new String[] { ":-*", ":*" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY4.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY4, 
 							new String[] { ":-0", ":0" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY5.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY5, 
 							new String[] { ":-((", ":((" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY6.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY6, 
 							new String[] { ":-~", ":~" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY7.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY7, 
 							new String[] { ":-|", ":|" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY8.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY8, 
 							new String[] { ":-P", ":P", ":-p", ":p" }));
 				
-		defaultPackList.add(new Smily(ImageLoader.SMILY9.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY9, 
 							new String[] { ":-))", ":))" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY10.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY10, 
 							new String[] { ":-(", ":(" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY11.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY11, 
 							new String[] { ":-)", ":)" }));
 		
-		defaultPackList.add(new Smily(ImageLoader.SMILY12.getId(), 
+		defaultPackList.add(new Smily(ImageLoader.SMILY12, 
 							new String[] { ";-)", ";)" }));
 
 		return defaultPackList;
@@ -437,7 +437,7 @@ public static ArrayList getDefaultSmiliesPack() {
 	 */
 
 	public static Image getImage(ImageID imageID) {
-				
+
 		String path = Images.getString(imageID.getId());
 		
 		Image image = null;

src/net/java/sip/communicator/impl/gui/main/utils/Smily.java

@@ -17,23 +17,13 @@ public class Smily {
 	
 	private String[] smilyStrings;
 
-	public Smily(String imagePath, String[] smilyStrings){
+	public Smily(ImageID imageID, String[] smilyStrings){
 		
-		this.setImageID(imageID);
+		this.imageID = imageID;
 		
 		this.setSmilyStrings(smilyStrings);
 	}
-	
-	public ImageID getImageID() {
-		
-		return imageID;
-	}
-
-	public void setImageID(ImageID imageID) {
 		
-		this.imageID = imageID;
-	}
-
 	public String[] getSmilyStrings() {
 		
 		return smilyStrings;
@@ -49,9 +39,12 @@ public String getDefaultString(){
 		return this.smilyStrings[0];
 	}
 	
-	public String getImagePath(){
+	public ImageID getImageID(){
 		
-		return Images.getString(this.imageID.getId());
+		return this.imageID;
 	}
 	
+	public String getImagePath(){
+		return Images.getString(this.getImageID().getId());
+	}
 }