javamanager/javainstaller/installer/javasrc.s60/com/nokia/mj/impl/installer/applicationregistrator/SifRegistrator.java
equal
deleted
inserted
replaced
652 String groupName = aSuiteInfo.getInstallationGroup(); |
652 String groupName = aSuiteInfo.getInstallationGroup(); |
653 if (groupName == null) |
653 if (groupName == null) |
654 { |
654 { |
655 groupName = ""; // default installation group |
655 groupName = ""; // default installation group |
656 } |
656 } |
657 String iconFilename = aSuiteInfo.getRegisteredIconPath(aIndex); |
657 String iconFilename = null; |
|
658 if (!appInfo.getUseDefaultIcon()) |
|
659 { |
|
660 iconFilename = aSuiteInfo.getRegisteredIconPath(aIndex); |
|
661 } |
658 Log.log("SifRegistrator iconFilename " + aIndex + ": " + iconFilename); |
662 Log.log("SifRegistrator iconFilename " + aIndex + ": " + iconFilename); |
659 int numberOfIcons = 1; |
663 int numberOfIcons = 1; |
660 // Initalize localized names for the application. |
664 // Initalize localized names for the application. |
661 LocalizedName[] localizedNames = getLocalizedNames( |
665 LocalizedName[] localizedNames = getLocalizedNames( |
662 aSuiteInfo, "Nokia-MIDlet-" + (aIndex+1) + "-"); |
666 aSuiteInfo, "Nokia-MIDlet-" + (aIndex+1) + "-"); |
734 int cid = 0; |
738 int cid = 0; |
735 if (aIndex == -1) |
739 if (aIndex == -1) |
736 { |
740 { |
737 if (aSuite.getComponentId() == null) |
741 if (aSuite.getComponentId() == null) |
738 { |
742 { |
739 Log.logWarning( |
743 Log.log( |
740 "SifRegistrator.registerLocalizedComponentName: cid not present in suite"); |
744 "SifRegistrator.registerLocalizedComponentName: cid not present in suite"); |
741 return; |
745 return; |
742 } |
746 } |
743 cid = aSuite.getComponentId().getId(); |
747 cid = aSuite.getComponentId().getId(); |
744 localizedNames = getLocalizedNames(aSuite, "Nokia-MIDlet-Name-"); |
748 localizedNames = getLocalizedNames(aSuite, "Nokia-MIDlet-Name-"); |
747 { |
751 { |
748 ApplicationInfo app = |
752 ApplicationInfo app = |
749 (ApplicationInfo)aSuite.getApplications().elementAt(aIndex); |
753 (ApplicationInfo)aSuite.getApplications().elementAt(aIndex); |
750 if (app.getComponentId() == null) |
754 if (app.getComponentId() == null) |
751 { |
755 { |
752 Log.logWarning( |
756 Log.log( |
753 "SifRegistrator.registerLocalizedComponentName: cid not present in app"); |
757 "SifRegistrator.registerLocalizedComponentName: cid not present in app"); |
754 return; |
758 return; |
755 } |
759 } |
756 cid = app.getComponentId().getId(); |
760 cid = app.getComponentId().getId(); |
757 localizedNames = getLocalizedNames( |
761 localizedNames = getLocalizedNames( |
783 */ |
787 */ |
784 private void registerLocalizedProperties(SuiteInfo aSuite) |
788 private void registerLocalizedProperties(SuiteInfo aSuite) |
785 { |
789 { |
786 if (aSuite.getComponentId() == null) |
790 if (aSuite.getComponentId() == null) |
787 { |
791 { |
788 Log.logWarning( |
792 Log.log( |
789 "SifRegistrator.registerLocalizedProperties: cid not present in suite"); |
793 "SifRegistrator.registerLocalizedProperties: cid not present in suite"); |
790 return; |
794 return; |
791 } |
795 } |
792 int cid = aSuite.getComponentId().getId(); |
796 int cid = aSuite.getComponentId().getId(); |
793 final int UNSPECIFIED_LOCALE = -1; // KUnspecifiedLocale |
797 final int UNSPECIFIED_LOCALE = -1; // KUnspecifiedLocale |