# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Users/catlan/Projekte/netbeans/collab/ui
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 endcoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: src/org/netbeans/modules/collab/ui/options/Bundle.properties
*** /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/Bundle.properties Base (1.2)
--- /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/Bundle.properties Locally Modified (Based On 1.2)
***************
*** 63,65 ****
--- 63,69 ----
PROP_CollabSettingsBeanInfo_AutoAcceptConversation_Description=Automatically accept conversation invitation
PROP_CollabSettingsBeanInfo_AutoAcceptConversation_DisplayName=Automatically Accept Conversation Invitation
+ PROP_CollabSettingsBeanInfo_NickCompletion_Description=Tap the first unique letters of a nick and press \
+ ctrl+space and it completes the name
+
+ PROP_CollabSettingsBeanInfo_NickCompletion_DisplayName=Nick completion
Index: src/org/netbeans/modules/collab/ui/options/CollabOptionPanel.java
*** /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabOptionPanel.java Base (1.1)
--- /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabOptionPanel.java Locally Modified (Based On 1.1)
***************
*** 44,49 ****
--- 44,52 ----
cbShowPresenceNotifications.setSelected(
model.getShowPresenceNotifications()
);
+ cbNickCompletion.setSelected(
+ model.getNickCompletion()
+ );
}
public boolean isChanged() {
***************
*** 59,64 ****
--- 62,69 ----
return true;
if (cbShowPresenceNotifications.isSelected() != model.getShowPresenceNotifications())
return true;
+ if (cbNickCompletion.isSelected() != model.getNickCompletion())
+ return true;
return false;
}
***************
*** 83,88 ****
--- 88,96 ----
model.setShowPresenceNotifications(
cbShowPresenceNotifications.isSelected()
);
+ model.setNickCompletion(
+ cbNickCompletion.isSelected()
+ );
}
void cancel() {
***************
*** 100,105 ****
--- 108,114 ----
cbAutoAcceptConversation = new javax.swing.JCheckBox();
cbAutoApprove = new javax.swing.JCheckBox();
cbAutoLogin = new javax.swing.JCheckBox();
+ cbNickCompletion = new javax.swing.JCheckBox();
spIdleTimeout = new javax.swing.JSpinner();
jLabel3 = new javax.swing.JLabel();
jPanel3 = new javax.swing.JPanel();
***************
*** 134,139 ****
--- 143,154 ----
cbAutoLogin.setMargin(new java.awt.Insets(0, 0, 0, 0));
cbAutoLogin.setOpaque(false);
+ cbNickCompletion.setText(org.openide.util.NbBundle.getMessage(CollabOptionPanel.class, "PROP_CollabSettingsBeanInfo_NickCompletion_DisplayName"));
+ cbNickCompletion.setToolTipText(org.openide.util.NbBundle.getMessage(CollabOptionPanel.class, "PROP_CollabSettingsBeanInfo_NickCompletion_Description"));
+ cbNickCompletion.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
+ cbNickCompletion.setMargin(new java.awt.Insets(0, 0, 0, 0));
+ cbNickCompletion.setOpaque(false);
+
spIdleTimeout.setToolTipText(org.openide.util.NbBundle.getMessage(CollabOptionPanel.class, "PROP_CollabSettingsBeanInfo_IdleTimeout_Description"));
jLabel3.setLabelFor(spIdleTimeout);
***************
*** 147,152 ****
--- 162,168 ----
.add(org.jdesktop.layout.GroupLayout.LEADING, jPanel2Layout.createSequentialGroup()
.addContainerGap()
.add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(cbNickCompletion)
.add(cbAutoAcceptConversation)
.add(cbAutoApprove)
.add(cbAutoLogin)
***************
*** 154,160 ****
.add(spIdleTimeout, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 43, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jLabel3)))
! .addContainerGap(299, Short.MAX_VALUE))
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
--- 170,176 ----
.add(spIdleTimeout, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 43, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jLabel3)))
! .addContainerGap(250, Short.MAX_VALUE))
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
***************
*** 165,170 ****
--- 181,188 ----
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cbAutoLogin)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(cbNickCompletion)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(spIdleTimeout, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(jLabel3))
***************
*** 192,198 ****
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(cbPlayAudioNotifications)
.add(cbShowPresenceNotifications))
! .addContainerGap(407, Short.MAX_VALUE))
);
jPanel3Layout.setVerticalGroup(
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
--- 210,216 ----
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(cbPlayAudioNotifications)
.add(cbShowPresenceNotifications))
! .addContainerGap(360, Short.MAX_VALUE))
);
jPanel3Layout.setVerticalGroup(
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
***************
*** 215,222 ****
.add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
.add(jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
! .add(jPanel3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
! .addContainerGap())
);
}// //GEN-END:initComponents
--- 233,239 ----
.add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
.add(jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
! .add(jPanel3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
);
}// //GEN-END:initComponents
***************
*** 226,231 ****
--- 243,249 ----
private javax.swing.JCheckBox cbAutoAcceptConversation;
private javax.swing.JCheckBox cbAutoApprove;
private javax.swing.JCheckBox cbAutoLogin;
+ private javax.swing.JCheckBox cbNickCompletion;
private javax.swing.JCheckBox cbPlayAudioNotifications;
private javax.swing.JCheckBox cbShowPresenceNotifications;
private javax.swing.JLabel jLabel3;
Index: src/org/netbeans/modules/collab/ui/options/CollabOptionPanel.form
*** /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabOptionPanel.form Base (1.1)
--- /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabOptionPanel.form Locally Modified (Based On 1.1)
***************
*** 38,44 ****
-
--- 38,43 ----
***************
*** 62,67 ****
--- 61,67 ----
+
***************
*** 71,77 ****
!
--- 71,77 ----
!
***************
*** 84,89 ****
--- 84,91 ----
+
+
***************
*** 136,141 ****
--- 138,162 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 179,185 ****
!
--- 200,206 ----
!
Index: src/org/netbeans/modules/collab/ui/options/CollabSettings.java
*** /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabSettings.java Base (1.2)
--- /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabSettings.java Locally Modified (Based On 1.2)
***************
*** 32,37 ****
--- 32,38 ----
public static final String PROP_AUTO_APPROVE = "autoApprove";
public static final String PROP_AUTO_LOGIN = "autoLogin";
public static final String PROP_AUTO_ACCEPT_CONVERSATION = "autoAcceptConversation";
+ public static final String PROP_NICK_COMPLETION = "nickCompletion";
/**
*
***************
*** 58,63 ****
--- 59,65 ----
setAutoApprove(Boolean.FALSE);
setAutoLogin(Boolean.TRUE);
setAutoAcceptConversation(Boolean.FALSE);
+ setNickCompletion(Boolean.TRUE);
}
/**
***************
*** 198,204 ****
--- 200,224 ----
// true = automatically fire property changes if needed
putProperty(PROP_AUTO_ACCEPT_CONVERSATION, value, true);
}
+
+ /**
+ *
+ *
+ */
+ public Boolean getNickCompletion() {
+ return (Boolean) getProperty(PROP_NICK_COMPLETION);
}
+
+ /**
+ *
+ *
+ */
+ public void setNickCompletion(Boolean value) {
+ // true = automatically fire property changes if needed
+ putProperty(PROP_NICK_COMPLETION, value, true);
+ }
+ }
Index: src/org/netbeans/modules/collab/ui/options/CollabSettingsBeanInfo.java
*** /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabSettingsBeanInfo.java Base (1.2)
--- /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabSettingsBeanInfo.java Locally Modified (Based On 1.2)
***************
*** 141,146 ****
--- 141,167 ----
)
); // NOI18N
descriptorList.add(descriptor);
+
+ // NickCompletion
+ descriptor = new PropertyDescriptor(
+ CollabSettings.PROP_NICK_COMPLETION, // NOI18N
+ CollabSettings.class
+ );
+ descriptor.setDisplayName(
+ NbBundle.getMessage(
+ CollabSettingsBeanInfo.class,
+ "PROP_CollabSettingsBeanInfo_" + // NOI18N
+ "NickCompletion_DisplayName"
+ )
+ ); // NOI18N
+ descriptor.setShortDescription(
+ NbBundle.getMessage(
+ CollabSettingsBeanInfo.class,
+ "PROP_CollabSettingsBeanInfo_" + // NOI18N
+ "NickCompletion_Description"
+ )
+ ); // NOI18N
+ descriptorList.add(descriptor);
} catch (IntrospectionException e) {
Debug.debugNotify(e);
}
Index: src/org/netbeans/modules/collab/ui/options/CollabOptionModel.java
*** /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabOptionModel.java Base (1.1)
--- /Users/catlan/Projekte/netbeans/collab/ui/src/org/netbeans/modules/collab/ui/options/CollabOptionModel.java Locally Modified (Based On 1.1)
***************
*** 102,108 ****
--- 102,123 ----
settings.setAutoAcceptConversation(Boolean.valueOf(value));
}
+ boolean getNickCompletion() {
+ CollabSettings settings = (CollabSettings) CollabSettings.findObject
+ (CollabSettings.class, true);
+
+ return settings.getNickCompletion().booleanValue();
}
+
+ void setNickCompletion(final boolean value) {
+ CollabSettings settings = (CollabSettings) CollabSettings.findObject
+ (CollabSettings.class, true);
+
+ settings.setNickCompletion(Boolean.valueOf(value));
+ }
+
+ }