TERMS AND CONDITIONS

# HG changeset patch # User Marek Slama # Date 1232114683 -3600 # Node ID 05004c56eb7c491c23aa0ea945c57e8bdf387eed # Parent 384709fa7d682682ee6b266c3ffb9f23f5fa7bfe #156952: Remove share.java.net from ui. diff -r 384709fa7d68 -r 05004c56eb7c c.s.collablet/collablet/src/com/sun/collablet/Account.java --- a/c.s.collablet/collablet/src/com/sun/collablet/Account.java Fri Jan 16 14:39:06 2009 +0100 +++ b/c.s.collablet/collablet/src/com/sun/collablet/Account.java Fri Jan 16 15:04:43 2009 +0100 @@ -72,9 +72,8 @@ public static final String PROP_PROXY_PASSWORD = "proxyPassword"; // NOI18N public static final String PROP_VALID = "valid"; // NOI18N public static final String PROP_AUTO_LOGIN = "autoLogin"; // NOI18N - public static final int NEW_PUBLIC_SERVER_ACCOUNT = 0; - public static final int EXISTING_ACCOUNT = 1; - public static final int NEW_ACCOUNT = 2; + public static final int EXISTING_ACCOUNT = 0; + public static final int NEW_ACCOUNT = 1; //////////////////////////////////////////////////////////////////////////// // Instance variables diff -r 384709fa7d68 -r 05004c56eb7c collab.ui/src/org/netbeans/modules/collab/ui/DefaultUserInterface.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/DefaultUserInterface.java Fri Jan 16 14:39:06 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/DefaultUserInterface.java Fri Jan 16 15:04:43 2009 +0100 @@ -323,10 +323,7 @@ account = settings.getAccount(); // If the account is new, try to register it - if ( - (account.getAccountType() == Account.NEW_ACCOUNT) || - (account.getAccountType() == Account.NEW_PUBLIC_SERVER_ACCOUNT) - ) { + if (account.getAccountType() == Account.NEW_ACCOUNT) { RequestProcessor.postRequest(new AsyncAccountRegistration(account)); } else { try { diff -r 384709fa7d68 -r 05004c56eb7c collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountServerPanel.form --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountServerPanel.form Fri Jan 16 14:39:06 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountServerPanel.form Fri Jan 16 15:04:43 2009 +0100 @@ -1,6 +1,6 @@ -

+ @@ -8,15 +8,17 @@ - + - + + + @@ -89,7 +91,7 @@ - + @@ -98,7 +100,7 @@ - + @@ -162,7 +164,7 @@ - + @@ -171,7 +173,7 @@ - + diff -r 384709fa7d68 -r 05004c56eb7c collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountServerPanel.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountServerPanel.java Fri Jan 16 14:39:06 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountServerPanel.java Fri Jan 16 15:04:43 2009 +0100 @@ -127,20 +127,12 @@ public void readSettings(Object object) { AccountWizardSettings settings = AccountWizardSettings.narrow(object); Account account = settings.getAccount(); - String prepopulated_serverURL = NbBundle.getMessage( - AccountServerPanel.class, "PROP_AccountServerPanel_ServerURL" - ); // NOI18N serverField.setEditable(true); - if (settings.getAccount().getAccountType() == Account.NEW_PUBLIC_SERVER_ACCOUNT) { - serverField.setText(prepopulated_serverURL); - serverField.setEditable(false); - } else { - String serverURL = account.getServer(); + String serverURL = account.getServer(); - if ((serverURL != null) && !serverURL.trim().equals("")) { - serverField.setText(serverURL); - } + if ((serverURL != null) && !serverURL.trim().equals("")) { + serverField.setText(serverURL); } switch (account.getProxyType()) { diff -r 384709fa7d68 -r 05004c56eb7c collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.form --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.form Fri Jan 16 14:39:06 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.form Fri Jan 16 15:04:43 2009 +0100 @@ -1,6 +1,6 @@ - + @@ -8,25 +8,24 @@ - + - + - - - + + - + @@ -48,59 +47,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -115,7 +62,7 @@ - + @@ -130,7 +77,36 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 384709fa7d68 -r 05004c56eb7c collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.java Fri Jan 16 14:39:06 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.java Fri Jan 16 15:04:43 2009 +0100 @@ -50,6 +50,7 @@ import org.openide.util.NbBundle; import com.sun.collablet.Account; +import java.net.URL; import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.InputMap; @@ -70,18 +71,8 @@ public AccountTypePanel() { super(NbBundle.getMessage(AccountTypePanel.class, "LBL_AccountTypePanel_Name")); // NOI18N initComponents(); - termsOfConditionLbl.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + lblAddtionalInfoLnk.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); initAccessibility(); - - Action keyAction = new AbstractAction() { - public void actionPerformed(ActionEvent e) { - termsOfConditionLblAction(); - } - }; - - InputMap inputMap = getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.ALT_MASK), "keyAction"); - getActionMap().put("keyAction", keyAction); } /** @@ -91,15 +82,7 @@ boolean isNewAccountSelected() { return newAccountBtn.isSelected(); } - - /** - * - * - */ - boolean isNewHostedServerAccountSelected() { - return newHostedServerAccountBtn.isSelected(); - } - + /** * * @@ -122,12 +105,6 @@ break; - case Account.NEW_PUBLIC_SERVER_ACCOUNT: - newHostedServerAccountBtn.setSelected(true); - setValid(acceptCheckBox.isSelected()); - - break; - case Account.EXISTING_ACCOUNT: existingAccountBtn.setSelected(true); setValid(true); @@ -135,7 +112,6 @@ break; default: - newHostedServerAccountBtn.setSelected(true); setValid(false); } @@ -155,16 +131,10 @@ } else if (newAccountBtn.isSelected()) { settings.getAccount().setAccountType(Account.NEW_ACCOUNT); settings.setNewAccount(true); - } else { - settings.getAccount().setAccountType(Account.NEW_PUBLIC_SERVER_ACCOUNT); - settings.setNewAccount(true); } } public void initAccessibility() { - newHostedServerAccountBtn.getAccessibleContext().setAccessibleDescription( - NbBundle.getMessage(AccountTypePanel.class, "ACSD_DESC_AccountTypePanel_NewHostedServerAccount") - ); // NOI18N existingAccountBtn.getAccessibleContext().setAccessibleDescription( NbBundle.getMessage(AccountTypePanel.class, "ACSD_DESC_AccountTypePanel_ExistingAccount") ); // NOI18N @@ -172,9 +142,6 @@ NbBundle.getMessage(AccountTypePanel.class, "ACSD_DESC_AccountTypePanel_NewAccount") ); // NOI18N - newHostedServerAccountBtn.getAccessibleContext().setAccessibleName( - NbBundle.getMessage(AccountTypePanel.class, "ACSD_NAME_AccountTypePanel_NewHostedServerAccount") - ); // NOI18N existingAccountBtn.getAccessibleContext().setAccessibleName( NbBundle.getMessage(AccountTypePanel.class, "ACSD_NAME_AccountTypePanel_ExistingAccount") ); // NOI18N @@ -193,24 +160,22 @@ * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; buttonGroup = new javax.swing.ButtonGroup(); jPanel1 = new javax.swing.JPanel(); jLabel1 = new javax.swing.JLabel(); - newHostedServerAccountBtn = new javax.swing.JRadioButton(); - acceptCheckBox = new javax.swing.JCheckBox(); - termsOfConditionLbl = new javax.swing.JLabel(); newAccountBtn = new javax.swing.JRadioButton(); existingAccountBtn = new javax.swing.JRadioButton(); + lblAdditionalInfo = new javax.swing.JLabel(); + lblAddtionalInfoLnk = new javax.swing.JLabel(); messageLbl = new javax.swing.JLabel(); FormListener formListener = new FormListener(); setBorder(javax.swing.BorderFactory.createCompoundBorder(null, javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5))); - setPreferredSize(new java.awt.Dimension(450, 300)); setLayout(new java.awt.GridBagLayout()); jPanel1.setLayout(new java.awt.GridBagLayout()); @@ -218,46 +183,21 @@ java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/collab/ui/wizard/Bundle"); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(jLabel1, bundle.getString("LBL_AccountTypePanel_AccountType")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(0, 0, 20, 0); + gridBagConstraints.insets = new java.awt.Insets(0, 0, 10, 0); jPanel1.add(jLabel1, gridBagConstraints); - - buttonGroup.add(newHostedServerAccountBtn); - org.openide.awt.Mnemonics.setLocalizedText(newHostedServerAccountBtn, bundle.getString("BTN_AccountTypePanel_NewHostedServerAccount")); // NOI18N - newHostedServerAccountBtn.addChangeListener(formListener); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0); - jPanel1.add(newHostedServerAccountBtn, gridBagConstraints); - - org.openide.awt.Mnemonics.setLocalizedText(acceptCheckBox, bundle.getString("LBL_AccountTypePanel_AcceptCheckBox")); // NOI18N - acceptCheckBox.setEnabled(false); - acceptCheckBox.setMargin(new java.awt.Insets(2, 22, 2, 2)); - acceptCheckBox.addChangeListener(formListener); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0); - jPanel1.add(acceptCheckBox, gridBagConstraints); - - org.openide.awt.Mnemonics.setLocalizedText(termsOfConditionLbl, bundle.getString("LBL_AccountTypePanel_TermsOfConditionLnk")); // NOI18N - termsOfConditionLbl.addMouseListener(formListener); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0); - jPanel1.add(termsOfConditionLbl, gridBagConstraints); buttonGroup.add(newAccountBtn); org.openide.awt.Mnemonics.setLocalizedText(newAccountBtn, bundle.getString("BTN_AccountTypePanel_NewAccount")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = java.awt.GridBagConstraints.RELATIVE; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weightx = 1.0; @@ -267,13 +207,36 @@ buttonGroup.add(existingAccountBtn); org.openide.awt.Mnemonics.setLocalizedText(existingAccountBtn, bundle.getString("BTN_AccountTypePanel_ExistingAccount")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = java.awt.GridBagConstraints.RELATIVE; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weightx = 1.0; gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0); jPanel1.add(existingAccountBtn, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(lblAdditionalInfo, org.openide.util.NbBundle.getMessage(AccountTypePanel.class, "LBL_AccountTypePanel_AdditionalInfo")); // NOI18N + lblAdditionalInfo.setFocusable(false); + lblAdditionalInfo.setRequestFocusEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(5, 0, 0, 0); + jPanel1.add(lblAdditionalInfo, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(lblAddtionalInfoLnk, org.openide.util.NbBundle.getMessage(AccountTypePanel.class, "LBL_AccountTypePanel_AdditionalInfoLnk")); // NOI18N + lblAddtionalInfoLnk.addMouseListener(formListener); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 3; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(5, 0, 0, 0); + jPanel1.add(lblAddtionalInfoLnk, gridBagConstraints); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; @@ -298,11 +261,11 @@ // Code for dispatching events from components to event handlers. - private class FormListener implements java.awt.event.MouseListener, javax.swing.event.ChangeListener { + private class FormListener implements java.awt.event.MouseListener { FormListener() {} public void mouseClicked(java.awt.event.MouseEvent evt) { - if (evt.getSource() == termsOfConditionLbl) { - AccountTypePanel.this.termsOfConditionLblMouseClicked(evt); + if (evt.getSource() == lblAddtionalInfoLnk) { + AccountTypePanel.this.lblAdditionalLinkInfoLnkHandlerMouseClicked(evt); } } @@ -317,76 +280,27 @@ public void mouseReleased(java.awt.event.MouseEvent evt) { } - - public void stateChanged(javax.swing.event.ChangeEvent evt) { - if (evt.getSource() == newHostedServerAccountBtn) { - AccountTypePanel.this.newHostedServerAccountBtnStateChanged(evt); - } - else if (evt.getSource() == acceptCheckBox) { - AccountTypePanel.this.acceptCheckBoxStateChanged(evt); - } - } }// //GEN-END:initComponents - private void acceptCheckBoxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_acceptCheckBoxStateChanged - setValid(acceptCheckBox.isSelected()); - }//GEN-LAST:event_acceptCheckBoxStateChanged - - private void newHostedServerAccountBtnStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_newHostedServerAccountBtnStateChanged - - if (newHostedServerAccountBtn.isSelected()) { - acceptCheckBox.setEnabled(true); - } else { - acceptCheckBox.setSelected(false); - acceptCheckBox.setEnabled(false); - setValid(true); + private void lblAdditionalLinkInfoLnkHandlerMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblAdditionalLinkInfoLnkHandlerMouseClicked + URL u = null; + try { + u = new URL(NbBundle.getMessage(AccountTypePanel.class, "NB_WIKI_URL")); // NOI18N + } catch (MalformedURLException exc) { } - }//GEN-LAST:event_newHostedServerAccountBtnStateChanged - - private void termsOfConditionLblMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_termsOfConditionLblMouseClicked - termsOfConditionLblAction(); - }//GEN-LAST:event_termsOfConditionLblMouseClicked - - private void termsOfConditionLblAction() { - String text = NbBundle.getMessage(AccountTypePanel.class, "MSG_AccountTypePanel_TermsOfCondition"); // NOI18N - String userHome = System.getProperty("netbeans.user"); // NOI18N - String legalFileDir = userHome + File.separator + "collab" + // NOI18N - File.separator + "java.net"; // NOI18N - String legalFileName = legalFileDir + File.separator + "terms_of_condition.html"; // NOI18N - File legalFile = new File(legalFileName); - - if (!legalFile.exists()) { - File legalFileDirectory = new File(legalFileDir); - legalFileDirectory.mkdirs(); - - try { - FileOutputStream output = new FileOutputStream(legalFile); - output.write(text.getBytes()); - output.flush(); - output.close(); - } catch (FileNotFoundException fnf) { - Debug.debugNotify(fnf); - } catch (IOException ioe) { - Debug.debugNotify(ioe); - } + if (u != null) { + org.openide.awt.HtmlBrowser.URLDisplayer.getDefault().showURL(u); } - - try { - HtmlBrowser.URLDisplayer.getDefault().showURL(legalFile.toURI().toURL()); - } catch (MalformedURLException me) { - Debug.debugNotify(me); - } - } + }//GEN-LAST:event_lblAdditionalLinkInfoLnkHandlerMouseClicked // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JCheckBox acceptCheckBox; private javax.swing.ButtonGroup buttonGroup; private javax.swing.JRadioButton existingAccountBtn; private javax.swing.JLabel jLabel1; private javax.swing.JPanel jPanel1; + private javax.swing.JLabel lblAdditionalInfo; + private javax.swing.JLabel lblAddtionalInfoLnk; private javax.swing.JLabel messageLbl; private javax.swing.JRadioButton newAccountBtn; - private javax.swing.JRadioButton newHostedServerAccountBtn; - private javax.swing.JLabel termsOfConditionLbl; // End of variables declaration//GEN-END:variables } diff -r 384709fa7d68 -r 05004c56eb7c collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties Fri Jan 16 14:39:06 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties Fri Jan 16 15:04:43 2009 +0100 @@ -149,450 +149,13 @@ MSG_AccountInfoPanel_MultiByteNotAllowed=Multibyte characters are not allowed in user name -PROP_AccountServerPanel_ServerURL=share.java.net\:5222 -LBL_AccountTypePanel_TermsOfConditionLnk=terms and conditions - -LBL_AccountTypePanel_AcceptCheckBox=&Accept - -MSG_AccountTypePanel_TermsOfCondition=\ - \ - \ - TERMS AND CONDITIONS \ - \ - \ -

1. ACCEPTANCE OF TERMS

\ -

Welcome to Sun Microsystems Developer Collaboration. Sun \ -Microsystems provides this service to you, subject to the following \ -Terms of Service ("TOS") , which may be updated by us from \ -time to time without notice to you. You can review the most current \ -version of the TOS at any time at: http://sun.com. \ -

\ -

BY CLICKING THE "I ACCEPT" BUTTON (IN ORDER TO DOWNLOAD \ -AND INSTALL SUN MICROSYSTEMS DEVELOPER COLLABORATION ON YOUR \ -COMPUTER) YOU AGREE TO BE BOUND BY THE SOFTWARE LICENSE AND TOS.

\ -

2. DESCRIPTION OF SERVICE

\ -

Sun Microsystems Developer Collaboration (the "Service") \ -provides users with the capability to see when their friends are \ -online, send and receive instant messages, share files, receive \ -alerts, and other material and information via the Internet. By \ -registering and using the Service, you acknowledge that other users \ -of the Service may elect to receive a notification from the Service \ -when you sign on and may send you instant messages and other \ -information via the Service. If you desire to block the notification \ -feature of the Service sent to other users or if you don't want to \ -receive messages from such users, you can enable the "Invisible" \ -feature of the Service. By using the Service, you agree that Sun \ -Microsystems has no responsibility for the assessment, or for \ -resolving any disputes arising from a User's ability to ignore, send \ -messages or otherwise use the Service.

\ -

In order to use the Service, you must obtain access to the World \ -Wide Web, either directly or through devices that access web-based \ -content, and pay any service fees associated with such access. In \ -addition, you must provide all equipment necessary to make such \ -connection to the World Wide Web, including a computer and modem or \ -other access device. \ -

\ -

All Software provided to the U.S. Government pursuant to \ -solicitations issued on or after December 1, 1995 is provided with \ -the commercial rights and restrictions described herein. In addition, \ -you agree that the Software may not be acquired, shipped, \ -transported, exported, or reexported (1) into (or to a national or \ -resident of) any U.S. embargoed country or (2) to anyone on the U.S. \ -Treasury Department's list of Specially Designated Nationals or the \ -U.S. Department of Commerce's Table of Denial Orders. By using the \ -Software, you represent and warrant that you are not located in, \ -under control of, or a national or resident of any such country or on \ -any such list.

\ -

Unless explicitly stated otherwise, any new features that augment \ -or enhance the current Service, shall be subject to the Software \ -License and this Terms of Use. You understand and agree that the \ -Service is provided "AS-IS" and that Sun Microsystems \ -assumes no responsibility for the timeliness, deletion, mis-delivery \ -or failure to store any user communications or personalization \ -settings. You also understand that Sun Microsystems is not \ -responsible for the security or privacy of communications sent via \ -the Service where the Service is being accessed via wireless devices. \ -

\ -

3. DATA TRANSMITTED AND COLLECTED BY THE SERVICE

\ -

• The Service requires you to obtain a Sun Microsystems \ -Developer Collaboration ID and password and transmits this \ -information to Sun Microsystems when you launch the program to \ -verify your identity. Sun Microsystems also stores your preferences \ -and profile settings, which you control.

\ -

• When you add a friend to your contact list, your friend's \ -ID is stored on our servers and is linked with your friend list and \ -vice versa. We use this information to display a list of your online \ -friends when you are using the program. If you choose to store \ -additional information about a friend on your contact list through \ -the Contact Info function, Sun Microsystems will store this \ -information. If you choose to "ignore" certain users \ -through your preference settings, that user's Sun Microsystems ID is \ -stored on our server in order to fulfill your ignore request.

\ -

.• When you use the Service, your instant messages ("IMs") \ -may be transmitted through our servers on their way to the recipient, \ -or, in the case of a conference, recipients. Any files you transmit \ -through the Service may also be transmitted through our servers. \ -

\ -

• Unless you log in to the Service using the "invisible \ -mode," your online status will be visible to other the Service \ -users who have you on their friends list. You can turn this off in \ -your preference settings. \ -

\ -

• You have certain choices about whether to add friends, be \ -added as a friend, or ignore other users. \ -

\ -

• Sun Microsystems does not save your messages.

\ -

• By using the Service, you may choose to make some of your \ -personal information public or you may choose to share some of your \ -personal information with others. If you post personal information \ -online that is accessible to the public, you may receive unsolicited \ -messages from other parties in return.

\ -

• The Service initially connects with Sun Microsystems, but \ -sometimes uses a peer-to-peer connection during its operation, \ -including times when you may be using it for instant messaging \ -(including text, mobile), file sharing, voice, and webcam streaming. \ -Peer-to-peer means that your computer connects directly to the other \ -user's computer in the conversation without needing to go through Sun \ -Microsystems servers. As such, your IP address is available to users \ -you share a peer-to-peer connection with. \ -

\ -

4. ADVERTISING IN THE SERVICE

\ -

• The graphical user interface for the Service may display \ -banner advertising to you from time to time in or around your friend \ -list or on one of the optional tabs that allow you to view other Sun \ -Microsystems services.

\ -

• Certain versions of the Service allow you to send and \ -receive images from a webcam. When you view another person's webcam, \ -the window in which their image is displayed may contain \ -advertisements that change periodically as long as the window is \ -open. Closing the window ends the display of these advertisements.

\ -

• Certain versions of the Service include a Call Center by \ -which you may place computer to phone calls over the internet. The \ -window in which you dial a telephone number may contain a banner \ -advertisement that changes periodically as long as the window is \ -open. Closing the window ends the display of this advertisement.

\ -

• If you type a search into the query box provided in some \ -versions of the Service, results of your search will be displayed in \ -a web browser.

\ -

5. MEMBER ACCOUNT, PASSWORD AND SECURITY

\ -

If you don't already have a Sun Microsystems Developer \ -Collaboration ID and password, you will be prompted to complete the \ -Microsystems Developer Collaboration registration process. You are \ -responsible for maintaining the confidentiality of the password and \ -account, and are fully responsible for all activities that occur \ -under your password or account. You agree to (a) immediately notify \ -Sun Microsystems of any unauthorized use of your password or account \ -or any other breach of security, and (b) ensure that you exit from \ -your account at the end of each session. Sun Microsystems cannot and \ -will not be liable for any loss or damage arising from your failure \ -to comply with this Section 5. The Service may allow you to \ -communicate with users of other instant messaging products. In that \ -event, you acknowledge and agree that (i) your use of the Service is \ -subject to the Software License and the terms governing the use of \ -other instant messaging products you have agreed to, if any, that are \ -consistent with the Software License and (ii) users of other instant \ -messaging products are subject to the terms governing such other \ -instant messaging products. Sun Microsystems assumes no \ -responsibility for the conduct or content of messages sent by users \ -of other instant messaging products.

\ -

6. PRIVACY POLICY

\ -

Your registration data and other information about you is subject \ -to our Privacy Policy. For more information, please see our full \ -privacy policy at http://www.sun.com/privacy/index.html.

\ -

7. MEMBER CONDUCT

\ -

You understand that all information, data, text, software, music, \ -sound, photographs, graphics, video, messages or other materials \ -("Content"), whether publicly posted or privately \ -transmitted, are the sole responsibility of the person from which \ -such Content originated. This means that you, and not Sun \ -Microsystems, are entirely responsible for all Content that you \ -upload, post or otherwise transmit via the Service. Sun Microsystems \ -does not control the Content posted via the Service and, as such, \ -does not guarantee the accuracy, integrity or quality of such \ -Content. You understand that by using the Service, you may be exposed \ -to Content that is offensive, indecent or objectionable. Under no \ -circumstances will Sun Microsystems be liable in any way for any \ -Content, including, but not limited to, for any errors or omissions \ -in any Content, or for any loss or damage of any kind incurred as a \ -result of the use of any Content posted or otherwise transmitted via \ -the Service. \ -

\ -

You agree to not use the Service to:

\ -

a. upload, post, email, transmit or otherwise make available any \ -Content that is unlawful, harmful, threatening, abusive, harassing, \ -tortious, defamatory, vulgar, obscene, libelous, invasive of \ -another's privacy, hateful, or racially, ethnically or otherwise \ -objectionable;

\ -

b. harm minors in any way; \ -

\ -

c. impersonate any person or entity, including, but not limited \ -to, a Sun Microsystems official, forum leader, guide or host, or \ -falsely state or otherwise misrepresent your affiliation with a \ -person or entity;

\ -

d. forge headers or otherwise manipulate identifiers in order to \ -disguise the origin of any Content transmitted through the Service;

\ -

e. upload, post, email, transmit or otherwise make available any \ -Content that you do not have a right to make available under any law \ -or under contractual or fiduciary relationships (such as inside \ -information, proprietary and confidential information learned or \ -disclosed as part of employment relationships or under nondisclosure \ -agreements);

\ -

f. upload, post, email, transmit or otherwise make available any \ -Content that infringes any patent, trademark, trade secret, copyright \ -or other proprietary rights ("Rights") of any party;

\ -

g. upload, post, email, transmit or otherwise make available any \ -unsolicited or unauthorized advertising, promotional materials, "junk \ -mail," "spam," "chain letters," "pyramid \ -schemes," or any other form of solicitation, except in those \ -areas (such as shopping rooms) that are designated for such purpose \ -(please read our complete Spam Policy);

\ -

h. upload, post, email, transmit or otherwise make available any \ -material that contains software viruses or any other computer code, \ -files or programs designed to interrupt, destroy or limit the \ -functionality of any computer software or hardware or \ -telecommunications equipment;

\ -

i. disrupt the normal flow of dialogue, cause a screen to "scroll" \ -faster than other users of the Service are able to type, or otherwise \ -act in a manner that negatively affects other users' ability to \ -engage in real time exchanges;

\ -

j. interfere with or disrupt the Service or servers or networks \ -connected to the Service, or disobey any requirements, procedures, \ -policies or regulations of networks connected to the Service;

\ -

k. intentionally or unintentionally violate any applicable local, \ -state, national or international law, including, but not limited to, \ -regulations promulgated by the U.S. Securities and Exchange \ -Commission, any rules of any national or other securities exchange, \ -including, without limitation, \ -

\ -

the New York Stock Exchange, the American Stock Exchange or the \ -NASDAQ, and any regulations having the force of law;

\ -

l. "stalk" or otherwise harass another; or

\ -

m. collect or store personal data about other users.

\ -

You acknowledge that Sun Microsystems may or may not pre-screen \ -Content, but that Sun Microsystems and its designees shall have the \ -right (but not the obligation) in their sole discretion to refuse or \ -move any Content that is available via the Service. Without limiting \ -the foregoing, Sun Microsystems and its designees shall have the \ -right to remove any Content that violates the Software License or is \ -otherwise objectionable. You agree that you must evaluate, and bear \ -all risks associated with, the use of any Content, including any \ -reliance on the accuracy, completeness, or usefulness of such \ -Content. In this regard, you acknowledge that you may not rely on any \ -Content created by Sun Microsystems or submitted to Sun Microsystems, \ -including without limitation information in Sun Microsystems Forum \ -Message Boards, and in all other parts of the Service. You \ -acknowledge, consent and agree that Sun Microsystems may access, \ -preserve, and disclose your account information and Content if \ -required to do so by law or in a good faith belief that such access \ -preservation or disclosure is reasonably necessary to: \ -

\ -

(a) comply with legal process; (b) enforce the Software License; \ -(c) respond to claims that any Content violates the rights of \ -third-parties; (d) respond to your requests for customer service; or \ -(e) protect the rights, property, or personal safety of Sun \ -Microsystems, its users and the public. You understand that the \ -Service and software embodied within the Service may include security \ -components that permit digital materials to be protected, and use of \ -these materials is subject to usage rules set by Sun Microsystems \ -and/or content providers who provide content to the Service. You may \ -not attempt to override or circumvent any of the usage rules embedded \ -into the Service. Any unauthorized reproduction, publication, further \ -distribution or public exhibition of the materials provided on the \ -Service, in whole or in part, is strictly prohibited.

\ -

You understand that the technical processing and transmission of \ -the Service, including your Content, may involve (a) transmissions \ -over various networks; and (b) changes to conform and adapt to \ -technical requirements of connecting networks or devices. \ -

\ -

8. SPECIAL ADMONITIONS FOR INTERNATIONAL USE

\ -

Recognizing the global nature of the Internet, you agree to comply \ -with all local rules regarding online conduct and acceptable Content. \ -Specifically, you agree to comply with all applicable laws regarding \ -the transmission of technical data exported from the United States or \ -the country in which you reside.

\ -

9. CONTENT SUBMITTED OR MADE AVAILABLE FOR INCLUSION ON THE \ -SERVICE

\ -

Sun Microsystems does not claim ownership of Content you submit or \ -make available for inclusion on the Service. However, with respect to \ -Content you submit or make available for inclusion on publicly \ -accessible areas of the Service, you grant Sun Microsystems the \ -world-wide, royalty free and non-exclusive the license to use, \ -distribute, reproduce, modify, adapt, publicly perform and publicly \ -display any photos and graphics you submit or make available for \ -inclusion in the Service, solely for the purpose for which such \ -Content was submitted or made available. This license exists only for \ -as long as you elect to continue to include such Content on the \ -Service and will terminate at the time you remove or Sun Microsystems \ -removes such Content from the Service.

\ -

10. INDEMNITY

\ -

You agree to indemnify and hold Sun Microsystems, and its \ -subsidiaries, affiliates, officers, agents, co-branders or other \ -partners, and employees, harmless from any claim or demand, including \ -reasonable attorneys' fees, made by any third party due to or arising \ -out of Content you submit, post, transmit or make available through \ -the Service, your use of the Service, your connection to the Service, \ -your violation of the Software License, or your violation of any \ -rights of another.

\ -

11. NO RESALE OF SERVICE

\ -

You agree not to reproduce, duplicate, copy, sell, trade, resell \ -or exploit for any commercial purposes, any portion of the Service \ -(including your Sun Microsystems Developer Collaboration ID), use of \ -the Service, or access to the Service.

\ -

12. GENERAL PRACTICES REGARDING USE AND STORAGE

\ -

You acknowledge that Sun Microsystems may establish general \ -practices and limits concerning use of the Service. You agree that \ -Sun Microsystems has no responsibility or liability for the deletion \ -or failure to store any messages and other communications or other \ -Content maintained or transmitted by the Service. You acknowledge \ -that Sun Microsystems reserves the right to log off accounts that are \ -inactive for an extended period of time. You further acknowledge that \ -Sun Microsystems reserves the right to change these general practices \ -and limits at any time, in its sole discretion, with or without \ -notice.

\ -

13. MODIFICATIONS TO SERVICE

\ -

Sun Microsystems reserves the right at any time and from time to \ -time to modify or discontinue, temporarily or permanently, the \ -Service (or any part thereof) with or without notice. You agree that \ -Sun Microsystems shall not be liable to you or to any third party for \ -any modification, suspension or discontinuance of the Service.

\ -

14. TERMINATION

\ -

You agree that Sun Microsystems may, under certain circumstances \ -and without prior notice, immediately terminate your Sun Microsystems \ -Developer Collaboration account, any associated email address, and \ -access to the Service. Cause for such termination shall include, but \ -not be limited to, (a) breaches or violations of the Software \ -License, the TOS, or other incorporated agreements or guidelines, (b) \ -requests by law enforcement or other government agencies, (c) a \ -request by you (self-initiated account deletions), (d) discontinuance \ -or material modification to the Service (or any part thereof), (e) \ -unexpected technical or security issues or problems, and (f) extended \ -periods of inactivity. Termination of your Microsystems Developer \ -Collaboration account includes (a) removal of access to all offerings \ -within or integrated with the Service, . (b) deletion of your \ -password and all related information, files and content associated \ -with or inside your account (or any part thereof), and (c) barring \ -further use of the Service. Further, you agree that all terminations \ -for cause shall be made in Sun Microsystems sole discretion and that \ -Sun Microsystems shall not be liable to you or any third-party for \ -any termination of your account, any associated email address, or \ -access to the Service.

\ -

15. DEALINGS WITH ADVERTISERS

\ -

Your correspondence or business dealings with, or participation in \ -promotions of, advertisers found on or through the Service, including \ -payment and delivery of related goods or services, and any other \ -terms, conditions, warranties or representations associated with such \ -dealings, are solely between you and such advertiser. You agree that \ -Sun Microsystems shall not be responsible or liable for any loss or \ -damage of any sort incurred as the result of any such dealings or as \ -the result of the presence of such advertisers on the Service.

\ -

16. LINKS

\ -

The Service may provide, or third parties may provide, links to \ -other World Wide Web sites or resources. Because Sun Microsystems has \ -no control over such sites and resources, you acknowledge and agree \ -that Sun Microsystems is not responsible for the availability of such \ -external sites or resources, and does not endorse and is not \ -responsible or liable for any Content, advertising, products, or \ -other materials on or available from such sites or resources. You \ -further acknowledge and agree that Sun Microsystems shall not be \ -responsible or liable, directly or indirectly, for any damage or loss \ -caused or alleged to be caused by or in connection with use of or \ -reliance on any such Content, goods or services available on or \ -through any such site or resource.

\ -

17. DISCLAIMER OF WARRANTIES

\ -

a. YOUR USE OF THE SERVICE IS AT YOUR SOLE RISK. THE SERVICE IS \ -PROVIDED ON AN "AS IS" AND "AS AVAILABLE" BASIS. \ -SUN MICROSYSTEMS EXPRESSLY DISCLAIMS ALL WARRANTIES OF ANY KIND, \ -WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED \ -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND \ -NON-INFRINGEMENT.

\ -

b. MICROSYSTEMS MAKES NO WARRANTY THAT (i) THE SERVICE WILL MEET \ -YOUR REQUIREMENTS, (ii) THE SERVICE WILL BE UNINTERRUPTED, TIMELY, \ -SECURE, OR ERROR-FREE, (iii) THE RESULTS THAT MAY BE OBTAINED FROM \ -THE USE OF THE SERVICE WILL BE ACCURATE OR RELIABLE, (iv) THE QUALITY \ -OF ANY PRODUCTS, SERVICES, INFORMATION, OR OTHER MATERIAL PURCHASED \ -OR OBTAINED BY YOU THROUGH THE SERVICE WILL MEET YOUR EXPECTATIONS, \ -AND (V) ANY ERRORS IN THE SOFTWARE WILL BE CORRECTED.

\ -

c. ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE \ -OF THE SERVICE IS DONE AT YOUR OWN DISCRETION AND RISK AND THAT YOU \ -WILL BE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR \ -LOSS OF DATA THAT RESULTS FROM THE DOWNLOAD OF ANY SUCH MATERIAL.

\ -

d. NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED BY \ -YOU FROM MICROSYSTEMS OR THROUGH OR FROM THE SERVICE SHALL CREATE ANY \ -WARRANTY NOT EXPRESSLY STATED IN THE SOFTWARE LICENSE OR TOS.

\ -

18. LIMITATION OF LIABILITY

\ -

YOU EXPRESSLY UNDERSTAND AND AGREE THAT MICROSYSTEMS SHALL NOT BE \ -LIABLE TO YOU FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, \ -CONSEQUENTIAL OR EXEMPLARY DAMAGES, INCLUDING BUT NOT LIMITED TO, \ -DAMAGES FOR LOSS OF PROFITS, GOODWILL, USE, DATA OR OTHER INTANGIBLE \ -LOSSES (EVEN IF MICROSYSTEMS HAS BEEN ADVISED OF THE POSSIBILITY OF \ -SUCH DAMAGES), RESULTING FROM: (i) THE USE OR THE INABILITY TO USE \ -THE SERVICE; (ii) THE COST OF PROCUREMENT OF SUBSTITUTE GOODS AND \ -SERVICES RESULTING FROM ANY GOODS, DATA, INFORMATION OR SERVICES \ -PURCHASED OR OBTAINED OR MESSAGES RECEIVED OR TRANSACTIONS ENTERED \ -INTO THROUGH OR FROM THE SERVICE; (iii) UNAUTHORIZED ACCESS TO OR \ -ALTERATION OF YOUR TRANSMISSIONS OR DATA; (iv) STATEMENTS OR CONDUCT \ -OF ANY THIRD PARTY ON THE SERVICE; OR (v) ANY OTHER MATTER RELATING \ -TO THE SERVICE.

\ -

19. EXCLUSIONS AND LIMITATIONS

\ -

SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN \ -WARRANTIES OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL \ -OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, SOME OF THE ABOVE LIMITATIONS \ -OF SECTIONS 18 AND 19 MAY NOT APPLY TO YOU.

\ -

20. SPECIAL ADMONITION FOR SERVICES RELATING TO FINANCIAL MATTERS

\ -

If you intend to create or join any service, receive or request \ -any news, messages, alerts or other information from the Service \ -concerning companies, stock quotes, investments or securities, please \ -read the above Sections 18 and 19 again. They go doubly for you. In \ -addition, for this type of information particularly, the phrase "Let \ -the investor beware" is apt. The Service is provided for \ -informational purposes only, and no Content included in the Service \ -is intended for trading or investing purposes. Sun Microsystems and \ -its licensors shall not be responsible or liable for the accuracy, \ -usefulness or availability of any information transmitted or made \ -available via the Service, and shall not be responsible or liable for \ -any trading or investment decisions made based on such information.

\ -

21. NOTICE

\ -

Sun Microsystems may provide you with notices, including those \ -regarding changes to the Software License, by either email, regular \ -mail, or postings on the Service.

\ -

22. GENERAL INFORMATION

\ -

The Software License and TOS constitute the entire agreement \ -between you and Sun Microsystems and govern your use of the Service, \ -superceding any prior agreements between you and Sun Microsystems. \ -You also may be subject to additional terms and conditions that may \ -apply when you use affiliate services, third-party content or \ -

\ -

third-party software. The Software License and the relationship \ -between you and Sun Microsystems shall be governed by the laws of the \ -State of California without regard to its conflict of law provisions. \ -You and Sun Microsystems agree to submit to the personal and \ -exclusive jurisdiction of the courts located within the county of \ -Santa Clara, California. The failure of Sun Microsystems to exercise \ -or enforce any right or provision of the Software License shall not \ -constitute a waiver of such right or provision. If any provision of \ -the Software License is found by a court of competent jurisdiction to \ -be invalid, the parties nevertheless agree that the court should \ -endeavor to give effect to the parties' intentions as reflected in \ -the provision, and the other provisions of the Software License \ -remain in full force and effect. You agree that regardless of any \ -statute or law to the contrary, any claim or cause of action arising \ -out of or related to use of the Service or the Software License must \ -be filed within one (1) year after such claim or cause of action \ -arose or be forever barred. You agree that you will not export or \ -re-export the Software, any part thereof, or any process or service \ -that is the direct product of the Software (the foregoing \ -collectively referred to as the "Restricted Components"), \ -to any country, person or entity subject to U.S. export restrictions. \ - The section titles in the Software License are for convenience only \ -and have no legal or contractual effect.

\ -

23. VIOLATIONS

\ -

Please report any violations of the Software License or TOS to our \ -Customer Care group.

\ - \ - - +LBL_AccountTypePanel_AdditionalInfo=Info howto setup collaboration server can be found LBL_AccountDisplayNamePanel_ExistingAccount_Message=To refer to this \ account later, please give it a name. Please note, this name is for your \ reference only. Other users will see the display name you specified when you \ registered the account. + +LBL_AccountTypePanel_AdditionalInfoLnk= here. + +NB_WIKI_URL=http://wiki.netbeans.org/CollabServer # HG changeset patch # User Marek Slama # Date 1232122039 -3600 # Node ID 9207d7240368561a340283bbf92f7ebd9aacab8b # Parent 0d29c76b62eda514784e105e74e8e6b291ca8be1 #156952: Remove unused keys from bundle. diff -r 0d29c76b62ed -r 9207d7240368 collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties Fri Jan 16 15:08:48 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties Fri Jan 16 17:07:19 2009 +0100 @@ -49,14 +49,12 @@ others, you must already have or create a registered user account on a \ collaboration server. BTN_AccountTypePanel_NewAccount=I want to register for a new collaboration account on \ -a different collaboration server -BTN_AccountTypePanel_NewHostedServerAccount=I want to register for a new collaboration account on share.java.net +a collaboration server BTN_AccountTypePanel_ExistingAccount=I have an existing account \ on a collaboration server and just need to configure this computer to access it ACSD_DESC_AccountTypePanel_ExistingAccount=Select this radio button if you want to use an existing account ACSD_DESC_AccountTypePanel_NewAccount=Select this radio button if you want to create a new account -ACSD_DESC_AccountTypePanel_NewHostedServerAccount=Select this radio button if you want to create a new account \ -on share.java.net + ACSD_NAME_AccountTypePanel_ExistingAccount=Existing Account Radio Button ACSD_NAME_AccountTypePanel_NewAccount=New Account Radio Button ACSD_NAME_AccountTypePanel_NewHostedServerAccount=New Hosted Server Account Radio Button # HG changeset patch # User Marek Slama # Date 1232530789 -3600 # Node ID 0463c821cd296eb5ccf08145f8fa272c82b83023 # Parent a4c0130f22920fe0a52e076e385a49eb77cee7ef Add metrics log for user login. diff -r a4c0130f2292 -r 0463c821cd29 collab.ui/src/org/netbeans/modules/collab/ui/Install.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/Install.java Tue Jan 20 13:16:47 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/Install.java Wed Jan 21 10:39:49 2009 +0100 @@ -49,6 +49,9 @@ import org.openide.windows.WindowManager; import com.sun.collablet.*; import java.awt.EventQueue; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; import java.util.prefs.Preferences; import org.netbeans.modules.collab.core.Debug; import org.netbeans.modules.collab.ui.options.CollabSettings; @@ -251,8 +254,12 @@ // Show the collab explorer CollabExplorerPanel.getInstance().showComponent(CollabExplorerPanel.COMPONENT_EXPLORER); - } - else { + + Logger logger = Logger.getLogger("org.netbeans.ui.metrics.collab"); // NOI18N + LogRecord rec = new LogRecord(Level.INFO, "USG_COLLAB_LOGIN"); // NOI18N + rec.setLoggerName(logger.getName()); + logger.log(rec); + } else { StatusDisplayer.getDefault().setStatusText( NbBundle.getMessage(Install.class, "MSG_Install_AutoLoginFailure") ); // NOI18N diff -r a4c0130f2292 -r 0463c821cd29 collab.ui/src/org/netbeans/modules/collab/ui/LoginAccountPanel.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/LoginAccountPanel.java Tue Jan 20 13:16:47 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/LoginAccountPanel.java Wed Jan 21 10:39:49 2009 +0100 @@ -49,6 +49,9 @@ import com.sun.collablet.Account; import com.sun.collablet.AccountManager; import com.sun.collablet.CollabManager; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; import java.util.prefs.Preferences; import org.netbeans.modules.collab.core.Debug; import org.openide.awt.Mnemonics; @@ -852,6 +855,11 @@ } } + Logger logger = Logger.getLogger("org.netbeans.ui.metrics.collab"); // NOI18N + LogRecord rec = new LogRecord(Level.INFO, "USG_COLLAB_LOGIN"); // NOI18N + rec.setLoggerName(logger.getName()); + logger.log(rec); + // Show the collab explorer CollabExplorerPanel.getInstance().showComponent(CollabExplorerPanel.COMPONENT_EXPLORER); } finally { # HG changeset patch # User Marek Slama # Date 1232547134 -3600 # Node ID f33524313ba37d168d821600ff7a48d1d5e349d7 # Parent d3d0ee186f8bd491e3bbcdb9d753dba9f961da48 #156946: Pass IDE version as license key. diff -r d3d0ee186f8b -r f33524313ba3 collab.provider.im/src/org/netbeans/modules/collab/provider/im/IMCollabSession.java --- a/collab.provider.im/src/org/netbeans/modules/collab/provider/im/IMCollabSession.java Wed Jan 21 10:45:46 2009 +0100 +++ b/collab.provider.im/src/org/netbeans/modules/collab/provider/im/IMCollabSession.java Wed Jan 21 15:12:14 2009 +0100 @@ -50,14 +50,20 @@ import com.sun.collablet.Conversation; import com.sun.collablet.ConversationPrivilege; -import org.openide.*; -import org.openide.util.*; - import java.beans.*; -import java.io.*; +import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.MissingResourceException; + +import org.openide.util.NbBundle; import org.netbeans.lib.collab.*; @@ -149,7 +155,7 @@ String v = (String)personalStoreService.getProfile().getProperty("licenseKey", ""); // NOI18N if (v.trim().length()==0) { - personalStoreService.getProfile().setProperty("licenseKey", "NB-50"); // NOI18N + personalStoreService.getProfile().setProperty("licenseKey", getIDEVersion()); // NOI18N personalStoreService.getProfile().save(); } String forumManage = personalStoreService.getProfile().getProperty("sunIMAllowForumManage", "deny"); // NOI18N @@ -180,6 +186,20 @@ // Set user online publishStatus(CollabPrincipal.STATUS_ONLINE, ""); // NOI18N + } + + private String getIDEVersion () { + String str = ""; // NOI18N + try { + str = MessageFormat.format( + NbBundle.getBundle("org.netbeans.core.startup.Bundle").getString("currentVersion"), // NOI18N + new Object[] {System.getProperty("netbeans.buildnumber")} // NOI18N + ); + } catch (MissingResourceException ex) { + // Ignore + Debug.debugNotify(ex); + } + return str; } /** # HG changeset patch # User Marek Slama # Date 1233675750 -3600 # Node ID 382068666c5628eb24180cce080de8d7c10156ee # Parent 07287f92878568670e859bd3bf42055c74affe64 Use defaults for message label. diff -r 07287f928785 -r 382068666c56 collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.form --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.form Tue Feb 03 11:49:28 2009 +0300 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.form Tue Feb 03 16:42:30 2009 +0100 @@ -114,19 +114,7 @@ - - - - - - - - - - - - diff -r 07287f928785 -r 382068666c56 collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.java Tue Feb 03 11:49:28 2009 +0300 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.java Tue Feb 03 16:42:30 2009 +0100 @@ -244,11 +244,7 @@ gridBagConstraints.weightx = 1.0; add(jPanel1, gridBagConstraints); - messageLbl.setForeground(new java.awt.Color(255, 51, 0)); org.openide.awt.Mnemonics.setLocalizedText(messageLbl, " "); - messageLbl.setMaximumSize(new java.awt.Dimension(2147483647, 15)); - messageLbl.setMinimumSize(new java.awt.Dimension(61, 35)); - messageLbl.setPreferredSize(new java.awt.Dimension(644, 15)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; # HG changeset patch # User Marek Slama # Date 1234529341 -3600 # Node ID 8552be2c10c6122d011c40ffb3f7fd1208c96675 # Parent d92888b118122b0dc5b057d702f166bed7ce4b97 #156952: Increment spec version. diff -r d92888b11812 -r 8552be2c10c6 collab.kit/manifest.mf --- a/collab.kit/manifest.mf Wed Feb 11 14:03:13 2009 +0100 +++ b/collab.kit/manifest.mf Fri Feb 13 13:49:01 2009 +0100 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.collab.kit/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/collab/kit/Bundle.properties -OpenIDE-Module-Specification-Version: 1.3 +OpenIDE-Module-Specification-Version: 1.4 AutoUpdate-Show-In-Client: true diff -r d92888b11812 -r 8552be2c10c6 collab.kit/nbproject/project.xml --- a/collab.kit/nbproject/project.xml Wed Feb 11 14:03:13 2009 +0100 +++ b/collab.kit/nbproject/project.xml Fri Feb 13 13:49:01 2009 +0100 @@ -40,7 +40,6 @@ Version 2 license, then the option applies only if the new code is made subject to such option by the copyright holder. --> - org.netbeans.modules.apisupport.project @@ -49,7 +48,6 @@ com.sun.collablet -

1.0.1 @@ -57,7 +55,6 @@

com.sun.collablet.moxc -

1.0.1 @@ -65,14 +62,12 @@

org.netbeans.libs.xmlbeans -

1.0

org.netbeans.modules.collab.channel.chat -

1.0.3 @@ -80,7 +75,6 @@

org.netbeans.modules.collab.channel.chat.html -

1.0.1 @@ -88,7 +82,6 @@

org.netbeans.modules.collab.channel.chat.java -

1.0.1 @@ -96,7 +89,6 @@

org.netbeans.modules.collab.channel.chat.text -

1.0.1 @@ -104,7 +96,6 @@

org.netbeans.modules.collab.channel.chat.xml -

1.0.1 @@ -112,7 +103,6 @@

org.netbeans.modules.collab.channel.filesharing -

1.0.2 @@ -120,24 +110,21 @@

org.netbeans.modules.collab.channel.output -

org.netbeans.modules.collab.provider.im -

1.4

org.netbeans.modules.collab.ui -

1 - 1.0.3 + 1.11

diff -r d92888b11812 -r 8552be2c10c6 collab.ui/manifest.mf --- a/collab.ui/manifest.mf Wed Feb 11 14:03:13 2009 +0100 +++ b/collab.ui/manifest.mf Fri Feb 13 13:49:01 2009 +0100 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.collab.ui/1 -OpenIDE-Module-Specification-Version: 1.10 +OpenIDE-Module-Specification-Version: 1.11 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/collab/ui/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/collab/ui/resources/layer.xml OpenIDE-Module-Install: org/netbeans/modules/collab/ui/Install.class # HG changeset patch # User Marek Slama # Date 1234529391 -3600 # Node ID e0c5eba4c51cd1d5808c683e8e55c4c49cf792d1 # Parent 8552be2c10c6122d011c40ffb3f7fd1208c96675 #156952: Final UI changes. Enable server warning dialog. diff -r 8552be2c10c6 -r e0c5eba4c51c collab.ui/src/org/netbeans/modules/collab/ui/Bundle.properties --- a/collab.ui/src/org/netbeans/modules/collab/ui/Bundle.properties Fri Feb 13 13:49:01 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/Bundle.properties Fri Feb 13 13:49:51 2009 +0100 @@ -1,6 +1,6 @@ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common @@ -428,7 +428,13 @@ ACSD_SplittedPanel_EmptySplitter=N/A #ServerWarning panel -LBL_ServerWarningMessage=Server share.java.net will be stopped on xx.xx.xxx +LBL_ServerWarningMsgTop=The server share.java.net is discontinuing service on April 20, 2009. +LBL_ServerWarningMsgBottom=For other options, visit the + +LBL_ServerWarningMsgLink= NetBeans User FAQ. +ACSN_ServerWarningMsgLink=Hyperlink to NetBeans User FAQ +ACSD_ServerWarningMsgLink=Hyperlink to NetBeans User FAQ + LBL_ServerWarningCheckBox=Do not show this warning dialog next time ACSN_ServerWarningCheckBox=Do not show this warning dialog next time ACSD_ServerWarningCheckBox=Do not show this warning dialog next time @@ -438,4 +444,6 @@ ACSD_OK=N/A ServerWarning_title=Server Warning -LBL_ServerWarningAction=Server Warning \ No newline at end of file +LBL_ServerWarningAction=Server Warning + +NB_FAQ_URL=http://wiki.netbeans.org/FaqShareJavaNet diff -r 8552be2c10c6 -r e0c5eba4c51c collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningAction.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningAction.java Fri Feb 13 13:49:01 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningAction.java Fri Feb 13 13:49:51 2009 +0100 @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common @@ -76,7 +76,7 @@ public void showDialog () { //Disabled till we get final UI/text for dialog - /*DialogDescriptor descriptor = new DialogDescriptor( + DialogDescriptor descriptor = new DialogDescriptor( new ServerWarningPanel(), NbBundle.getMessage(ServerWarningAction.class, "ServerWarning_title"), true, @@ -94,7 +94,7 @@ if (dlg != null) { dlg.dispose(); } - }*/ + } } @Override diff -r 8552be2c10c6 -r e0c5eba4c51c collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.form --- a/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.form Fri Feb 13 13:49:01 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.form Fri Feb 13 13:49:51 2009 +0100 @@ -19,45 +19,59 @@ - + - + - + - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + diff -r 8552be2c10c6 -r e0c5eba4c51c collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.java Fri Feb 13 13:49:01 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.java Fri Feb 13 13:49:51 2009 +0100 @@ -1,3 +1,44 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ + /* * ReminderPanel.java * @@ -6,13 +47,16 @@ package org.netbeans.modules.collab.ui; +import java.awt.Cursor; +import java.net.MalformedURLException; +import java.net.URL; import java.util.prefs.Preferences; import org.openide.util.NbBundle; import org.openide.util.NbPreferences; /** * - * @author mslama + * @author Marek Slama */ public class ServerWarningPanel extends javax.swing.JPanel { @@ -21,11 +65,20 @@ /** Creates new form ReminderPanel */ public ServerWarningPanel() { initComponents(); + lblWarningMsgLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); setText(); } private void setText () { - lblWarningMessage.setText(NbBundle.getMessage(ServerWarningPanel.class, "LBL_ServerWarningMessage")); + lblWarningMsgTop.setText(NbBundle.getMessage(ServerWarningPanel.class, "LBL_ServerWarningMsgTop")); + lblWarningMsgBottom.setText(NbBundle.getMessage(ServerWarningPanel.class, "LBL_ServerWarningMsgBottom")); + lblWarningMsgLink.setText(NbBundle.getMessage(ServerWarningPanel.class, "LBL_ServerWarningMsgLink")); + + lblWarningMsgLink.getAccessibleContext().setAccessibleName( + NbBundle.getMessage(ServerWarningAction.class,"ACSN_ServerWarningMsgLink")); + lblWarningMsgLink.getAccessibleContext().setAccessibleDescription( + NbBundle.getMessage(ServerWarningAction.class,"ACSD_ServerWarningMsgLink")); + chbWarning.setText(NbBundle.getMessage(ServerWarningPanel.class, "LBL_ServerWarningCheckBox")); chbWarning.getAccessibleContext().setAccessibleName( @@ -43,30 +96,67 @@ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents private void initComponents() { + java.awt.GridBagConstraints gridBagConstraints; - lblWarningMessage = new javax.swing.JLabel(); + lblWarningMsgTop = new javax.swing.JLabel(); + lblWarningMsgBottom = new javax.swing.JLabel(); + lblWarningMsgLink = new javax.swing.JLabel(); chbWarning = new javax.swing.JCheckBox(); setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)); setFocusable(false); - setLayout(new java.awt.BorderLayout()); + setLayout(new java.awt.GridBagLayout()); - lblWarningMessage.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - lblWarningMessage.setText("Server share.java.net will be stopped on xx.xx.xxx"); // NOI18N - lblWarningMessage.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); - lblWarningMessage.setFocusable(false); - lblWarningMessage.setRequestFocusEnabled(false); - add(lblWarningMessage, java.awt.BorderLayout.CENTER); + lblWarningMsgTop.setText("The server share.java.net is discontinuing service on April 20, 2009."); // NOI18N + lblWarningMsgTop.setFocusable(false); + lblWarningMsgTop.setRequestFocusEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5); + add(lblWarningMsgTop, gridBagConstraints); + + lblWarningMsgBottom.setText("For other options, visit the"); // NOI18N + lblWarningMsgBottom.setFocusable(false); + lblWarningMsgBottom.setRequestFocusEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 0); + add(lblWarningMsgBottom, gridBagConstraints); + + lblWarningMsgLink.setText(" NetBeans User FAQ."); // NOI18N + lblWarningMsgLink.addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + lblWarningMsgLinkMouseClicked(evt); + } + }); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 1; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(5, 0, 5, 5); + add(lblWarningMsgLink, gridBagConstraints); chbWarning.setText("Do not show this warning dialog next time"); // NOI18N - chbWarning.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); chbWarning.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); chbWarning.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { checkBoxItemStateChanged(evt); } }); - add(chbWarning, java.awt.BorderLayout.PAGE_END); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5); + add(chbWarning, gridBagConstraints); }// //GEN-END:initComponents private void checkBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_checkBoxItemStateChanged @@ -76,10 +166,23 @@ prefs.putBoolean("server.warning.show", false); // NOI18N } }//GEN-LAST:event_checkBoxItemStateChanged + + private void lblWarningMsgLinkMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblWarningMsgLinkMouseClicked + URL u = null; + try { + u = new URL(NbBundle.getMessage(ServerWarningPanel.class, "NB_FAQ_URL")); // NOI18N + } catch (MalformedURLException exc) { + } + if (u != null) { + org.openide.awt.HtmlBrowser.URLDisplayer.getDefault().showURL(u); + } + }//GEN-LAST:event_lblWarningMsgLinkMouseClicked // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JCheckBox chbWarning; - private javax.swing.JLabel lblWarningMessage; + private javax.swing.JLabel lblWarningMsgBottom; + private javax.swing.JLabel lblWarningMsgLink; + private javax.swing.JLabel lblWarningMsgTop; // End of variables declaration//GEN-END:variables } diff -r 8552be2c10c6 -r e0c5eba4c51c collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.java Fri Feb 13 13:49:01 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/AccountTypePanel.java Fri Feb 13 13:49:51 2009 +0100 @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common diff -r 8552be2c10c6 -r e0c5eba4c51c collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties Fri Feb 13 13:49:01 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties Fri Feb 13 13:49:51 2009 +0100 @@ -1,6 +1,6 @@ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common # HG changeset patch # User Marek Slama # Date 1234533839 -3600 # Node ID 95fe11ac1f29a746d765009202bf016845ec1209 # Parent 03692376c110d78f0b72c0c2dbd9367457d34aa7 #156952: Fix text. diff -r 03692376c110 -r 95fe11ac1f29 collab.ui/src/org/netbeans/modules/collab/ui/Bundle.properties --- a/collab.ui/src/org/netbeans/modules/collab/ui/Bundle.properties Fri Feb 13 13:53:05 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/Bundle.properties Fri Feb 13 15:03:59 2009 +0100 @@ -428,16 +428,16 @@ ACSD_SplittedPanel_EmptySplitter=N/A #ServerWarning panel -LBL_ServerWarningMsgTop=The server share.java.net is discontinuing service on April 20, 2009. -LBL_ServerWarningMsgBottom=For other options, visit the +LBL_ServerWarningMsgTop=Service for the share.java.net server will be discontinued as of April 20, 2009. +LBL_ServerWarningMsgBottom=For other options, please visit the LBL_ServerWarningMsgLink= NetBeans User FAQ. ACSN_ServerWarningMsgLink=Hyperlink to NetBeans User FAQ ACSD_ServerWarningMsgLink=Hyperlink to NetBeans User FAQ -LBL_ServerWarningCheckBox=Do not show this warning dialog next time -ACSN_ServerWarningCheckBox=Do not show this warning dialog next time -ACSD_ServerWarningCheckBox=Do not show this warning dialog next time +LBL_ServerWarningCheckBox=Show this warning dialog next time +ACSN_ServerWarningCheckBox=Show this warning dialog next time +ACSD_ServerWarningCheckBox=Show this warning dialog next time LBL_OK=OK ACSN_OK=N/A diff -r 03692376c110 -r 95fe11ac1f29 collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.form --- a/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.form Fri Feb 13 13:53:05 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.form Fri Feb 13 15:03:59 2009 +0100 @@ -26,7 +26,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -63,7 +63,7 @@ - + diff -r 03692376c110 -r 95fe11ac1f29 collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.java --- a/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.java Fri Feb 13 13:53:05 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/ServerWarningPanel.java Fri Feb 13 15:03:59 2009 +0100 @@ -107,7 +107,7 @@ setFocusable(false); setLayout(new java.awt.GridBagLayout()); - lblWarningMsgTop.setText("The server share.java.net is discontinuing service on April 20, 2009."); // NOI18N + lblWarningMsgTop.setText("Service for the share.java.net server will be discontinued as of April 20, 2009."); // NOI18N lblWarningMsgTop.setFocusable(false); lblWarningMsgTop.setRequestFocusEnabled(false); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -119,7 +119,7 @@ gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5); add(lblWarningMsgTop, gridBagConstraints); - lblWarningMsgBottom.setText("For other options, visit the"); // NOI18N + lblWarningMsgBottom.setText("For other options, please visit the"); // NOI18N lblWarningMsgBottom.setFocusable(false); lblWarningMsgBottom.setRequestFocusEnabled(false); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -143,7 +143,7 @@ gridBagConstraints.insets = new java.awt.Insets(5, 0, 5, 5); add(lblWarningMsgLink, gridBagConstraints); - chbWarning.setText("Do not show this warning dialog next time"); // NOI18N + chbWarning.setText("Show this warning dialog next time"); // NOI18N chbWarning.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); chbWarning.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { diff -r 03692376c110 -r 95fe11ac1f29 collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties --- a/collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties Fri Feb 13 13:53:05 2009 +0100 +++ b/collab.ui/src/org/netbeans/modules/collab/ui/wizard/Bundle.properties Fri Feb 13 15:03:59 2009 +0100 @@ -147,7 +147,7 @@ MSG_AccountInfoPanel_MultiByteNotAllowed=Multibyte characters are not allowed in user name -LBL_AccountTypePanel_AdditionalInfo=Info howto setup collaboration server can be found +LBL_AccountTypePanel_AdditionalInfo=Instructions for setting up a collaboration server can be found LBL_AccountDisplayNamePanel_ExistingAccount_Message=To refer to this \ account later, please give it a name. Please note, this name is for your \