mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Update Roster for adding gateways

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@5830 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-10-25 22:55:25 +00:00
committed by derek
parent ea64e730ac
commit 49a4209f96
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/installer/spark.install4j
View File

@ -10,7 +10,7 @@
<variables>
<variable name="VERSION_MAJOR" value="2" />
<variable name="VERSION_MINOR" value="0" />
<variable name="VERSION_REVISION" value="3" />
<variable name="VERSION_REVISION" value="4" />
<variable name="APP_NAME" value="Spark" />
<variable name="APP_SHORT_NAME" value="Spark" />
<variable name="PUBLISHER" value="Jive Software" />

3
build/projects/Spark.ipr
View File

@ -404,10 +404,9 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/../../../com/plugins/fastpath/Fastpath.iml" filepath="$PROJECT_DIR$/../../../com/plugins/fastpath/Fastpath.iml" />
<module fileurl="file://$PROJECT_DIR$/Spark.iml" filepath="$PROJECT_DIR$/Spark.iml" />
<module fileurl="file://$PROJECT_DIR$/../../../code/spark/client/src/plugins/nightmode/nightmode.iml" filepath="$PROJECT_DIR$/../../../code/spark/client/src/plugins/nightmode/nightmode.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="JDK 1.5.0" project-jdk-type="JavaSDK" />
<component name="ProjectRunConfigurationManager" />
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />

39
src/java/org/jivesoftware/spark/ui/RosterDialog.java
View File

@ -137,22 +137,14 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
public void focusLost(FocusEvent e) {
String jid = jidField.getText();
AccountItem item = (AccountItem)accounts.getSelectedItem();
Transport transport = item.getTransport();
if (ModelUtil.hasLength(jid) && jid.indexOf('@') == -1) {
// Append server address
if (transport == null) {
jidField.setText(jid + "@" + SparkManager.getConnection().getServiceName());
}
else {
jidField.setText(jid + "@" + transport.getServiceName());
}
}
String nickname = nicknameField.getText();
if (!ModelUtil.hasLength(nickname) && ModelUtil.hasLength(jid)) {
nicknameField.setText(StringUtils.parseName(jidField.getText()));
nickname = StringUtils.parseName(jid);
if (!ModelUtil.hasLength(nickname)) {
nickname = jid;
}
nicknameField.setText(nickname);
}
}
});
@ -226,7 +218,7 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
dialog = new JDialog(parent, Res.getString("title.add.contact"), true);
dialog.pack();
dialog.setContentPane(mainPanel);
dialog.setSize(350, 250);
dialog.setSize(350, 350);
dialog.setLocationRelativeTo(parent);
pane.addPropertyChangeListener(this);
@ -263,6 +255,20 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
String nickname = nicknameField.getText();
String group = (String)groupBox.getSelectedItem();
AccountItem item = (AccountItem)accounts.getSelectedItem();
Transport transport = item.getTransport();
if (transport == null) {
if (contact.indexOf("@") == -1) {
contact = contact + "@" + SparkManager.getConnection().getHost();
}
}
else {
if (contact.indexOf("@") == -1) {
contact = contact + "@" + transport.getServiceName();
}
}
if (!ModelUtil.hasLength(nickname) && ModelUtil.hasLength(contact)) {
// Try to load nickname from VCard
VCard vcard = new VCard();
@ -283,7 +289,6 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
ContactGroup contactGroup = contactList.getContactGroup(group);
boolean isSharedGroup = contactGroup != null && contactGroup.isSharedGroup();
if (isSharedGroup) {
errorMessage = Res.getString("message.cannot.add.contact.to.shared.group");
}
@ -390,7 +395,7 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
List<AccountItem> list = new ArrayList<AccountItem>();
// Create Jabber Account
AccountItem account = new AccountItem(SparkRes.getImageIcon(SparkRes.ADDRESS_BOOK_16x16), "Jabber", null);
AccountItem account = new AccountItem(SparkRes.getImageIcon(SparkRes.SMALL_MESSAGE_IMAGE), "Jabber", null);
list.add(account);
for (Transport transport : TransportManager.getTransports()) {
@ -418,7 +423,7 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
JLabel label = new JLabel();
label.setText(name);
label.setFont(new Font("Dialog", Font.BOLD, 11));
label.setFont(new Font("Dialog", Font.PLAIN, 11));
label.setHorizontalTextPosition(JLabel.CENTER);
add(iconLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));