[sc1.0-cvs] CVS update: /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/utils/

yanas at dev.java.net yanas at dev.java.net
Tue Feb 7 17:27:50 CET 2006


User: yanas   
Date: 2006/02/07 08:27:50

Log:
 "smile" images problem solved

File Changes:

Directory: /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/utils/
=========================================================================================

File [changed]: ImageLoader.java
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java?r1=1.1&r2=1.2
Delta lines:  +13 -13
---------------------
--- ImageLoader.java	5 Feb 2006 19:37:30 -0000	1.1
+++ ImageLoader.java	7 Feb 2006 16:27:47 -0000	1.2
@@ -393,40 +393,40 @@
 
 		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;

File [changed]: Smily.java
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/utils/Smily.java?r1=1.1&r2=1.2
Delta lines:  +7 -14
--------------------
--- Smily.java	5 Feb 2006 19:37:45 -0000	1.1
+++ Smily.java	7 Feb 2006 16:27:47 -0000	1.2
@@ -17,23 +17,13 @@
 	
 	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 @@
 		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());
+	}
 }




---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe at sip-communicator-1-0-draft.dev.java.net
For additional commands, e-mail: cvs-help at sip-communicator-1-0-draft.dev.java.net





More information about the commits mailing list