1) Updated Asterisks.

2) Update contact list to fix presence issue.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@5432 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-09-19 20:12:53 +00:00
committed by derek
parent 90fb4b33fa
commit caf8563cc0
8 changed files with 172 additions and 128 deletions

View File

@ -82,15 +82,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/merge/systeminfo.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
@ -100,15 +91,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/merge/asterisk-im-client.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
@ -203,6 +185,24 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/dist/asterisk-im-client.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/dist/systeminfo.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">

View File

@ -153,37 +153,73 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="Test.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Test.java">
<provider selected="true" editor-type-id="text-editor">
<state line="17" column="19" selection-start="330" selection-end="330" vertical-scroll-proportion="0.28277886">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContactList.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactList.java">
<provider selected="true" editor-type-id="text-editor">
<state line="2049" column="13" selection-start="76318" selection-end="76318" vertical-scroll-proportion="0.3208763">
<state line="268" column="80" selection-start="9501" selection-end="9643" vertical-scroll-proportion="0.24031778">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Conferences.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/conferences/Conferences.java">
<file leaf-file-name="SoundPreferences.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreferences.java">
<provider selected="true" editor-type-id="text-editor">
<state line="118" column="34" selection-start="5020" selection-end="5020" vertical-scroll-proportion="0.54768044">
<state line="56" column="23" selection-start="1587" selection-end="1587" vertical-scroll-proportion="0.5322896">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="InvitationUI.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/conferences/InvitationUI.java">
<file leaf-file-name="SoundPlugin.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="175" column="79" selection-start="7537" selection-end="7537" vertical-scroll-proportion="0.5631443">
<state line="34" column="0" selection-start="1207" selection-end="1207" vertical-scroll-proportion="0.27299413">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="GroupChatRoom.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java">
<file leaf-file-name="ContactItem.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactItem.java">
<provider selected="true" editor-type-id="text-editor">
<state line="120" column="75" selection-start="4503" selection-end="4537" vertical-scroll-proportion="0.33247423">
<state line="120" column="44" selection-start="3975" selection-end="3975" vertical-scroll-proportion="0.19960861">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="XMPPConnection.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://C:/code/smack/source/org/jivesoftware/smack/XMPPConnection.java">
<provider selected="true" editor-type-id="text-editor">
<state line="782" column="0" selection-start="30060" selection-end="30060" vertical-scroll-proportion="0.1330724">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountManager.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://C:/code/smack/source/org/jivesoftware/smack/AccountManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="194" column="0" selection-start="7289" selection-end="7289" vertical-scroll-proportion="0.1330724">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountCreationWizard.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/AccountCreationWizard.java">
<provider selected="true" editor-type-id="text-editor">
<state line="258" column="51" selection-start="10312" selection-end="10312" vertical-scroll-proportion="0.30136988">
<folding />
</state>
</provider>
@ -463,7 +499,7 @@
</component>
<component name="RunManager">
<activeType name="Application" />
<tempConfiguration selected="false" default="false" name="Test" type="Application" factoryName="Application">
<tempConfiguration selected="true" default="false" name="Test" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.jivesoftware.Test" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
@ -472,13 +508,7 @@
<option name="ALTERNATIVE_JRE_PATH" />
<module name="Spark" />
<RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1346" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
</tempConfiguration>
<configuration selected="false" default="true" type="Applet" factoryName="Applet">
<module name="" />
@ -541,7 +571,7 @@
<ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="true" default="false" name="Fastpath" type="Application" factoryName="Application">
<configuration selected="false" default="false" name="Fastpath" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.jivesoftware.Spark" />
<option name="VM_PARAMETERS" value="-Dplugin=C:\code\spark\plugins\fastpath\plugin.xml" />
<option name="PROGRAM_PARAMETERS" value="" />
@ -602,24 +632,24 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="369" y="71" width="1280" height="947" extended-state="0" />
<frame x="-4" y="-4" width="1928" height="1178" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32947975" order="7" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.23941368" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.31501833" order="1" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.15671642" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.31428573" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3152381" order="8" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.31501833" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3990476" order="6" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32980457" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.26285714" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24896552" order="2" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.26190478" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24857375" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.45665446" order="4" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.45619047" order="4" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.26666668" order="8" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
@ -651,7 +681,6 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="Fix idle time issue." />
<MESSAGE value="Updating key mappings for cut and paste." />
<MESSAGE value="Remove quit button from login screen." />
<MESSAGE value="Update to latest build #" />
@ -661,6 +690,7 @@
<MESSAGE value="Update Screenshoter." />
<MESSAGE value="Move login button over to right." />
<MESSAGE value="Update Spark iwn for tagging." />
<MESSAGE value="Updating Spark for escaped JIDS." />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@ -701,79 +731,9 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ChatRoomClosingListener.java">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/conferences/InvitationUI.java">
<provider selected="true" editor-type-id="text-editor">
<state line="18" column="17" selection-start="391" selection-end="391" vertical-scroll-proportion="0.2994129">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/assistants/UserHistoryItem.java">
<provider selected="true" editor-type-id="text-editor">
<state line="76" column="47" selection-start="3466" selection-end="3466" vertical-scroll-proportion="0.33463797">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/panes/CurrentActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state line="159" column="60" selection-start="5786" selection-end="5786" vertical-scroll-proportion="0.42403176">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/LoginDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state line="78" column="19" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.33247423">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="258" column="0" selection-start="9501" selection-end="9501" vertical-scroll-proportion="0.46031746">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ChatManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="356" column="0" selection-start="11595" selection-end="11595" vertical-scroll-proportion="0.1686122">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/smack/source/org/jivesoftware/smack/util/StringUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="76" column="26" selection-start="2717" selection-end="2717" vertical-scroll-proportion="0.41115436">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ChatContainer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="987" column="0" selection-start="32965" selection-end="32965" vertical-scroll-proportion="0.5701058">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="371" column="7" selection-start="14831" selection-end="14831" vertical-scroll-proportion="0.43121693">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/MainWindowListener.java">
<provider selected="true" editor-type-id="text-editor">
<state line="20" column="17" selection-start="619" selection-end="619" vertical-scroll-proportion="0.33501896">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/conferences/ConferenceInviteDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state line="56" column="12" selection-start="1799" selection-end="1799" vertical-scroll-proportion="-0.32216495">
<state line="183" column="33" selection-start="7956" selection-end="7956" vertical-scroll-proportion="0.73840207">
<folding />
</state>
</provider>
@ -785,23 +745,93 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/conferences/Conferences.java">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/util/SwingWorker.java">
<provider selected="true" editor-type-id="text-editor">
<state line="118" column="34" selection-start="5020" selection-end="5020" vertical-scroll-proportion="0.54768044">
<state line="131" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="0.17193426">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/smack/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="425" column="54" selection-start="18339" selection-end="18339" vertical-scroll-proportion="0.34386852">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/resources/META-INF/plugins.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="23" column="29" selection-start="967" selection-end="972" vertical-scroll-proportion="0.3324905">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/phone/PhonePlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="78" column="0" selection-start="3026" selection-end="3026" vertical-scroll-proportion="0.7092288">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Spark.java">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="44" selection-start="1603" selection-end="1603" vertical-scroll-proportion="0.13906448">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/AccountCreationWizard.java">
<provider selected="true" editor-type-id="text-editor">
<state line="258" column="51" selection-start="10312" selection-end="10312" vertical-scroll-proportion="0.30136988">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/smack/source/org/jivesoftware/smack/AccountManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="194" column="0" selection-start="7289" selection-end="7289" vertical-scroll-proportion="0.1330724">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/smack/source/org/jivesoftware/smack/XMPPConnection.java">
<provider selected="true" editor-type-id="text-editor">
<state line="782" column="0" selection-start="30060" selection-end="30060" vertical-scroll-proportion="0.1330724">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactItem.java">
<provider selected="true" editor-type-id="text-editor">
<state line="120" column="44" selection-start="3975" selection-end="3975" vertical-scroll-proportion="0.19960861">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Test.java">
<provider selected="true" editor-type-id="text-editor">
<state line="17" column="19" selection-start="330" selection-end="330" vertical-scroll-proportion="0.28277886">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactList.java">
<provider selected="true" editor-type-id="text-editor">
<state line="2049" column="13" selection-start="76318" selection-end="76318" vertical-scroll-proportion="0.3208763">
<state line="268" column="80" selection-start="9501" selection-end="9643" vertical-scroll-proportion="0.24031778">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/conferences/InvitationUI.java">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreferences.java">
<provider selected="true" editor-type-id="text-editor">
<state line="175" column="79" selection-start="7537" selection-end="7537" vertical-scroll-proportion="0.5631443">
<state line="56" column="23" selection-start="1587" selection-end="1587" vertical-scroll-proportion="0.5322896">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="34" column="0" selection-start="1207" selection-end="1207" vertical-scroll-proportion="0.27299413">
<folding />
</state>
</provider>

View File

@ -279,6 +279,10 @@ public class AccountCreationWizard extends JPanel {
con = new XMPPConnection(localPref.getXmppHost(), port, serverName);
}
}
if(con != null){
con.connect();
}
return con;
}

View File

@ -34,8 +34,8 @@ import org.jivesoftware.smackx.SharedGroupManager;
import org.jivesoftware.smackx.packet.LastActivity;
import org.jivesoftware.spark.ChatManager;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.Workspace;
import org.jivesoftware.spark.UserManager;
import org.jivesoftware.spark.Workspace;
import org.jivesoftware.spark.component.InputDialog;
import org.jivesoftware.spark.component.RolloverButton;
import org.jivesoftware.spark.component.VerticalFlowLayout;
@ -216,7 +216,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("control N"), "searchContacts");
getActionMap().put("searchContacts", new AbstractAction("searchContacts") {
public void actionPerformed(ActionEvent evt) {
// searchContacts("");
// searchContacts("");
}
});
@ -297,7 +297,10 @@ public final class ContactList extends JPanel implements ActionListener, Contact
// If not available, move to offline group.
else if (presence.getType() == Presence.Type.unavailable && !isPending) {
moveToOfflineGroup(bareJID);
presence = roster.getPresence(bareJID);
if (presence == null) {
moveToOfflineGroup(bareJID);
}
}
}

View File

@ -72,7 +72,7 @@ public class PhonePlugin implements Plugin {
}
catch (Exception e) {
// Ignore because the user does not have support.
//Log.error(e);
Log.error(e);
}
return phoneClient;
}

View File

@ -11,10 +11,12 @@
package org.jivesoftware.sparkimpl.preference.sounds;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.Roster;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.packet.DelayInformation;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.plugin.Plugin;
@ -39,9 +41,14 @@ public class SoundPlugin implements Plugin, MessageListener, ChatRoomListener {
if (presence != null && presence.getType() == Presence.Type.unavailable) {
SoundPreferences preferences = soundPreference.getPreferences();
if (preferences != null && preferences.isPlayOfflineSound()) {
String offline = preferences.getOfflineSound();
File offlineFile = new File(offline);
SparkManager.getSoundManager().playClip(offlineFile);
Roster roster = SparkManager.getConnection().getRoster();
final String bareJID = StringUtils.parseBareAddress(presence.getFrom());
presence = roster.getPresence(bareJID);
if (presence == null) {
String offline = preferences.getOfflineSound();
File offlineFile = new File(offline);
SparkManager.getSoundManager().playClip(offlineFile);
}
}
}
}