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

Revert title change.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@4534 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-07-18 02:53:04 +00:00
committed by derek
parent eabef1b093
commit 0274a7934e
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/jivesoftware/MainWindow.java
View File

@ -495,12 +495,6 @@ public final class MainWindow extends JFrame implements ActionListener {
} }
public void setNickname(String nickname) {
String mainWindowTitle = getMainWindowTitle();
String newWindowTitle = mainWindowTitle + " - " + nickname;
setTitle(newWindowTitle);
}
/** /**
* Displays the About Box for Spark. * Displays the About Box for Spark.
*/ */

14
src/java/org/jivesoftware/spark/ui/status/StatusBar.java
View File

@ -91,7 +91,7 @@ public class StatusBar extends JPanel {
add(imageLabel, new GridBagConstraints(0, 0, 1, 4, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0)); add(imageLabel, new GridBagConstraints(0, 0, 1, 4, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
//add(nicknameLabel, new GridBagConstraints(1, 0, 2, 2, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5, 5, 0, 0), 0, 0)); add(nicknameLabel, new GridBagConstraints(1, 0, 2, 2, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5, 5, 0, 0), 0, 0));
add(statusPanel, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 2, 0, 0), 0, 0)); add(statusPanel, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 2, 0, 0), 0, 0));
// Add Command Panel. We want adding command buttons to be simple. // Add Command Panel. We want adding command buttons to be simple.
@ -143,6 +143,10 @@ public class StatusBar extends JPanel {
validateTree(); validateTree();
} }
public void setNickname(String nickname){
nicknameLabel.setText(nickname);
}
/** /**
* Sets the current status text in the Status Manager. * Sets the current status text in the Status Manager.
* *
@ -414,19 +418,19 @@ public class StatusBar extends JPanel {
String firstName = vCard.getFirstName(); String firstName = vCard.getFirstName();
String lastName = vCard.getLastName(); String lastName = vCard.getLastName();
if (ModelUtil.hasLength(firstName) && ModelUtil.hasLength(lastName)) { if (ModelUtil.hasLength(firstName) && ModelUtil.hasLength(lastName)) {
SparkManager.getMainWindow().setNickname(firstName + " " + lastName); setNickname(firstName + " " + lastName);
} }
else if (ModelUtil.hasLength(firstName)) { else if (ModelUtil.hasLength(firstName)) {
SparkManager.getMainWindow().setNickname(firstName); setNickname(firstName);
} }
else { else {
String nickname = SparkManager.getSessionManager().getUsername(); String nickname = SparkManager.getSessionManager().getUsername();
SparkManager.getMainWindow().setNickname(nickname); setNickname(nickname);
} }
} }
else { else {
String nickname = SparkManager.getSessionManager().getUsername(); String nickname = SparkManager.getSessionManager().getUsername();
SparkManager.getMainWindow().setNickname(nickname); setNickname(nickname);
return; return;
} }

6
src/java/org/jivesoftware/sparkimpl/profile/VCardManager.java
View File

@ -22,6 +22,7 @@ import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.packet.VCard; import org.jivesoftware.smackx.packet.VCard;
import org.jivesoftware.spark.SparkManager; import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.ui.status.StatusBar;
import org.jivesoftware.spark.component.TitlePanel; import org.jivesoftware.spark.component.TitlePanel;
import org.jivesoftware.spark.component.borders.PartialLineBorder; import org.jivesoftware.spark.component.borders.PartialLineBorder;
import org.jivesoftware.spark.util.GraphicUtils; import org.jivesoftware.spark.util.GraphicUtils;
@ -446,11 +447,12 @@ public class VCardManager {
else { else {
String firstName = vcard.getFirstName(); String firstName = vcard.getFirstName();
String lastName = vcard.getLastName(); String lastName = vcard.getLastName();
StatusBar statusBar = SparkManager.getWorkspace().getStatusBar();
if (ModelUtil.hasLength(firstName) && ModelUtil.hasLength(lastName)) { if (ModelUtil.hasLength(firstName) && ModelUtil.hasLength(lastName)) {
SparkManager.getMainWindow().setNickname(firstName + " " + lastName); statusBar.setNickname(firstName + " " + lastName);
} }
else if (ModelUtil.hasLength(firstName)) { else if (ModelUtil.hasLength(firstName)) {
SparkManager.getMainWindow().setNickname(firstName); statusBar.setNickname(firstName);
} }
} }
} }