From 757bafb552c229224f104875218b0b7a9fa1c6a9 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Thu, 18 May 2006 12:19:16 +0000 Subject: [PATCH] "Smily" changed to "Smiley" --- .../gui/main/message/SmiliesSelectorBox.java | 14 ++-- .../main/message/toolBars/MainToolBar.java | 12 ++-- .../buttons/{smily.png => smiley.png} | Bin .../{smilyRollover.png => smileyRollover.png} | Bin .../buttons/src/{smily.svg => smiley.svg} | 0 .../default/{smily1.gif => smiley1.gif} | Bin .../default/{smily10.gif => smiley10.gif} | Bin .../default/{smily11.gif => smiley11.gif} | Bin .../default/{smily12.gif => smiley12.gif} | Bin .../default/{smily2.gif => smiley2.gif} | Bin .../default/{smily3.gif => smiley3.gif} | Bin .../default/{smily4.gif => smiley4.gif} | Bin .../default/{smily5.gif => smiley5.gif} | Bin .../default/{smily6.gif => smiley6.gif} | Bin .../default/{smily7.gif => smiley7.gif} | Bin .../default/{smily8.gif => smiley8.gif} | Bin .../default/{smily9.gif => smiley9.gif} | Bin .../impl/gui/utils/ImageLoader.java | 63 +++++++++--------- .../impl/gui/utils/images.properties | 26 ++++---- 19 files changed, 57 insertions(+), 58 deletions(-) rename src/net/java/sip/communicator/impl/gui/resources/buttons/{smily.png => smiley.png} (100%) rename src/net/java/sip/communicator/impl/gui/resources/buttons/{smilyRollover.png => smileyRollover.png} (100%) rename src/net/java/sip/communicator/impl/gui/resources/buttons/src/{smily.svg => smiley.svg} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily1.gif => smiley1.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily10.gif => smiley10.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily11.gif => smiley11.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily12.gif => smiley12.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily2.gif => smiley2.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily3.gif => smiley3.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily4.gif => smiley4.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily5.gif => smiley5.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily6.gif => smiley6.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily7.gif => smiley7.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily8.gif => smiley8.gif} (100%) rename src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/{smily9.gif => smiley9.gif} (100%) diff --git a/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java index 48406c68e..b783a5496 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java @@ -17,7 +17,7 @@ import net.java.sip.communicator.impl.gui.main.customcontrols.BoxPopupMenu; import net.java.sip.communicator.impl.gui.main.customcontrols.MsgToolbarButton; import net.java.sip.communicator.impl.gui.utils.ImageLoader; -import net.java.sip.communicator.impl.gui.utils.Smily; +import net.java.sip.communicator.impl.gui.utils.Smiley; public class SmiliesSelectorBox extends BoxPopupMenu implements ActionListener { @@ -34,12 +34,12 @@ public SmiliesSelectorBox(ArrayList imageList) { for (int i = 0; i < imageList.size(); i ++){ - Smily smily = (Smily)this.imageList.get(i); + Smiley smiley = (Smiley)this.imageList.get(i); MsgToolbarButton imageButton - = new MsgToolbarButton(ImageLoader.getImage(smily.getImageID())); + = new MsgToolbarButton(ImageLoader.getImage(smiley.getImageID())); - imageButton.setToolTipText(smily.getSmilyStrings()[0]); + imageButton.setToolTipText(smiley.getSmileyStrings()[0]); imageButton.addActionListener(this); @@ -55,13 +55,13 @@ public void actionPerformed(ActionEvent e) { for (int i = 0; i < this.imageList.size(); i ++){ - Smily smily = (Smily)this.imageList.get(i); + Smiley smiley = (Smiley)this.imageList.get(i); - if(buttonText.equals(smily.getSmilyStrings()[0])){ + if(buttonText.equals(smiley.getSmileyStrings()[0])){ JEditorPane editorPane = this.messageWindow.getCurrentChatWritePanel().getEditorPane(); - editorPane.setText(editorPane.getText() + smily.getSmilyStrings()[0] + " "); + editorPane.setText(editorPane.getText() + smiley.getSmileyStrings()[0] + " "); editorPane.requestFocus(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java index 63440446d..ba123f9d9 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java @@ -38,7 +38,7 @@ public class MainToolBar extends SIPCommToolBar private MsgToolbarButton pasteButton = new MsgToolbarButton(ImageLoader.getImage(ImageLoader.PASTE_ICON)); - private MsgToolbarButton smilyButton + private MsgToolbarButton smileyButton = new MsgToolbarButton(ImageLoader.getImage(ImageLoader.SMILIES_ICON)); private MsgToolbarButton saveButton @@ -86,7 +86,7 @@ public MainToolBar (ChatWindow messageWindow){ this.addSeparator(); - this.add(smilyButton); + this.add(smileyButton); this.addSeparator(); @@ -117,8 +117,8 @@ public MainToolBar (ChatWindow messageWindow){ this.pasteButton.setName("paste"); this.pasteButton.setToolTipText(Messages.getString("paste")); - this.smilyButton.setName("smily"); - this.smilyButton.setToolTipText(Messages.getString("insertSmiley")); + this.smileyButton.setName("smiley"); + this.smileyButton.setToolTipText(Messages.getString("insertSmiley")); this.previousButton.setName("previous"); this.previousButton.setToolTipText(Messages.getString("previous")); @@ -140,7 +140,7 @@ public MainToolBar (ChatWindow messageWindow){ this.cutButton.addActionListener(this); this.copyButton.addActionListener(this); this.pasteButton.addActionListener(this); - this.smilyButton.addActionListener(this); + this.smileyButton.addActionListener(this); this.previousButton.addActionListener(this); this.nextButton.addActionListener(this); this.sendFileButton.addActionListener(this); @@ -194,7 +194,7 @@ public void actionPerformed(ActionEvent e) { editorPane.requestFocus(); - } else if (buttonText.equalsIgnoreCase("smily")) { + } else if (buttonText.equalsIgnoreCase("smiley")) { if (e.getSource() instanceof SIPCommButton){ diff --git a/src/net/java/sip/communicator/impl/gui/resources/buttons/smily.png b/src/net/java/sip/communicator/impl/gui/resources/buttons/smiley.png similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/buttons/smily.png rename to src/net/java/sip/communicator/impl/gui/resources/buttons/smiley.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/buttons/smilyRollover.png b/src/net/java/sip/communicator/impl/gui/resources/buttons/smileyRollover.png similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/buttons/smilyRollover.png rename to src/net/java/sip/communicator/impl/gui/resources/buttons/smileyRollover.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/buttons/src/smily.svg b/src/net/java/sip/communicator/impl/gui/resources/buttons/src/smiley.svg similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/buttons/src/smily.svg rename to src/net/java/sip/communicator/impl/gui/resources/buttons/src/smiley.svg diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily1.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley1.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily1.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley1.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily10.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley10.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily10.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley10.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily11.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley11.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily11.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley11.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily12.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley12.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily12.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley12.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily2.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley2.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily2.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley2.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily3.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley3.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily3.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley3.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily4.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley4.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily4.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley4.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily5.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley5.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily5.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley5.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily6.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley6.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily6.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley6.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily7.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley7.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily7.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley7.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily8.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley8.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily8.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley8.gif diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily9.gif b/src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley9.gif similarity index 100% rename from src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily9.gif rename to src/net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley9.gif diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java index 345f111f8..40c2b9507 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java +++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java @@ -435,29 +435,29 @@ public class ImageLoader { * ===================================================================== */ - public static final ImageID SMILY1 = new ImageID("SMILY1"); + public static final ImageID SMILEY1 = new ImageID("SMILEY1"); - public static final ImageID SMILY2 = new ImageID("SMILY2"); + public static final ImageID SMILEY2 = new ImageID("SMILEY2"); - public static final ImageID SMILY3 = new ImageID("SMILY3"); + public static final ImageID SMILEY3 = new ImageID("SMILEY3"); - public static final ImageID SMILY4 = new ImageID("SMILY4"); + public static final ImageID SMILEY4 = new ImageID("SMILEY4"); - public static final ImageID SMILY5 = new ImageID("SMILY5"); + public static final ImageID SMILEY5 = new ImageID("SMILEY5"); - public static final ImageID SMILY6 = new ImageID("SMILY6"); + public static final ImageID SMILEY6 = new ImageID("SMILEY6"); - public static final ImageID SMILY7 = new ImageID("SMILY7"); + public static final ImageID SMILEY7 = new ImageID("SMILEY7"); - public static final ImageID SMILY8 = new ImageID("SMILY8"); + public static final ImageID SMILEY8 = new ImageID("SMILEY8"); - public static final ImageID SMILY9 = new ImageID("SMILY9"); + public static final ImageID SMILEY9 = new ImageID("SMILEY9"); - public static final ImageID SMILY10 = new ImageID("SMILY10"); + public static final ImageID SMILEY10 = new ImageID("SMILEY10"); - public static final ImageID SMILY11 = new ImageID("SMILY11"); + public static final ImageID SMILEY11 = new ImageID("SMILEY11"); - public static final ImageID SMILY12 = new ImageID("SMILY12"); + public static final ImageID SMILEY12 = new ImageID("SMILEY12"); /** * Load default smilies pack @@ -469,60 +469,60 @@ public static ArrayList getDefaultSmiliesPack() { ArrayList defaultPackList = new ArrayList(); - defaultPackList.add(new Smily(ImageLoader.SMILY1, + defaultPackList.add(new Smiley(ImageLoader.SMILEY1, new String[] { "$-)", "$)" })); - defaultPackList.add(new Smily(ImageLoader.SMILY2, + defaultPackList.add(new Smiley(ImageLoader.SMILEY2, new String[] { "8-)", "8)" })); - defaultPackList.add(new Smily(ImageLoader.SMILY3, + defaultPackList.add(new Smiley(ImageLoader.SMILEY3, new String[] { ":-*", ":*" })); - defaultPackList.add(new Smily(ImageLoader.SMILY4, + defaultPackList.add(new Smiley(ImageLoader.SMILEY4, new String[] { ":-0", ":0" })); - defaultPackList.add(new Smily(ImageLoader.SMILY5, + defaultPackList.add(new Smiley(ImageLoader.SMILEY5, new String[] { ":-((", ":((" })); - defaultPackList.add(new Smily(ImageLoader.SMILY6, + defaultPackList.add(new Smiley(ImageLoader.SMILEY6, new String[] { ":-~", ":~" })); - defaultPackList.add(new Smily(ImageLoader.SMILY7, + defaultPackList.add(new Smiley(ImageLoader.SMILEY7, new String[] { ":-|", ":|" })); - defaultPackList.add(new Smily(ImageLoader.SMILY8, + defaultPackList.add(new Smiley(ImageLoader.SMILEY8, new String[] { ":-P", ":P", ":-p", ":p" })); - defaultPackList.add(new Smily(ImageLoader.SMILY9, + defaultPackList.add(new Smiley(ImageLoader.SMILEY9, new String[] { ":-))", ":))" })); - defaultPackList.add(new Smily(ImageLoader.SMILY10, + defaultPackList.add(new Smiley(ImageLoader.SMILEY10, new String[] { ":-(", ":(" })); - defaultPackList.add(new Smily(ImageLoader.SMILY11, + defaultPackList.add(new Smiley(ImageLoader.SMILEY11, new String[] { ":-)", ":)" })); - defaultPackList.add(new Smily(ImageLoader.SMILY12, + defaultPackList.add(new Smiley(ImageLoader.SMILEY12, new String[] { ";-)", ";)" })); return defaultPackList; } - public static Smily getSmily(String smilyString){ + public static Smiley getSmiley(String smileyString){ ArrayList smiliesList = getDefaultSmiliesPack(); for (int i = 0; i < smiliesList.size(); i++) { - Smily smily = (Smily) smiliesList.get(i); + Smiley smiley = (Smiley) smiliesList.get(i); - String[] smilyStrings = smily.getSmilyStrings(); + String[] smileyStrings = smiley.getSmileyStrings(); - for (int j = 0; j < smilyStrings.length; j++) { + for (int j = 0; j < smileyStrings.length; j++) { - String srcString = smilyStrings[j]; + String srcString = smileyStrings[j]; - if(srcString.equals(smilyString)) - return smily; + if(srcString.equals(smileyString)) + return smiley; } } return null; @@ -542,7 +542,6 @@ public static BufferedImage getImage(ImageID imageID) { } else { String path = Images.getString(imageID.getId()); - try { image = ImageIO.read(ImageLoader.class.getClassLoader().getResource(path)); diff --git a/src/net/java/sip/communicator/impl/gui/utils/images.properties b/src/net/java/sip/communicator/impl/gui/utils/images.properties index 9dbb0aaf1..8c21b561d 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/images.properties +++ b/src/net/java/sip/communicator/impl/gui/utils/images.properties @@ -56,7 +56,7 @@ MSG_TOOLBAR_ROLLOVER_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/butt COPY_ICON=net/java/sip/communicator/impl/gui/resources/buttons/copy.png CUT_ICON=net/java/sip/communicator/impl/gui/resources/buttons/cut.png PASTE_ICON=net/java/sip/communicator/impl/gui/resources/buttons/paste.png -SMILIES_ICON=net/java/sip/communicator/impl/gui/resources/buttons/smily.png +SMILIES_ICON=net/java/sip/communicator/impl/gui/resources/buttons/smiley.png SAVE_ICON=net/java/sip/communicator/impl/gui/resources/buttons/save.png PRINT_ICON=net/java/sip/communicator/impl/gui/resources/buttons/print.png CLOSE_ICON=net/java/sip/communicator/impl/gui/resources/buttons/close.png @@ -111,18 +111,18 @@ SIP_DND_ICON=net/java/sip/communicator/impl/gui/resources/protocols/sip/dndStatu SIP_OCCUPIED_ICON=net/java/sip/communicator/impl/gui/resources/protocols/sip/occupiedStatus.png SIP_CHAT_ICON=net/java/sip/communicator/impl/gui/resources/protocols/sip/chatStatus.png -SMILY1=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily1.gif -SMILY2=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily2.gif -SMILY3=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily3.gif -SMILY4=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily4.gif -SMILY5=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily5.gif -SMILY6=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily6.gif -SMILY7=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily7.gif -SMILY8=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily8.gif -SMILY9=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily9.gif -SMILY10=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily10.gif -SMILY11=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily11.gif -SMILY12=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily12.gif +SMILEY1=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley1.gif +SMILEY2=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley2.gif +SMILEY3=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley3.gif +SMILEY4=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley4.gif +SMILEY5=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley5.gif +SMILEY6=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley6.gif +SMILEY7=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley7.gif +SMILEY8=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley8.gif +SMILEY9=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley9.gif +SMILEY10=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley10.gif +SMILEY11=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley11.gif +SMILEY12=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley12.gif LOGIN_WINDOW_LOGO=net/java/sip/communicator/impl/gui/resources/common/loginWindowLogo.png