diff -r cf92c7779a79 i18n/manifest.mf --- a/i18n/manifest.mf Fri Nov 14 17:47:30 2008 +0000 +++ b/i18n/manifest.mf Sat Nov 15 00:02:44 2008 +0000 @@ -1,7 +1,7 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.i18n/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/i18n/Bundle.properties -OpenIDE-Module-Specification-Version: 1.25 +OpenIDE-Module-Specification-Version: 1.26 OpenIDE-Module-Layer: org/netbeans/modules/i18n/Layer.xml AutoUpdate-Show-In-Client: false diff -r cf92c7779a79 i18n/src/org/netbeans/modules/i18n/wizard/HardStringWizardPanel.form --- a/i18n/src/org/netbeans/modules/i18n/wizard/HardStringWizardPanel.form Fri Nov 14 17:47:30 2008 +0000 +++ b/i18n/src/org/netbeans/modules/i18n/wizard/HardStringWizardPanel.form Sat Nov 15 00:02:44 2008 +0000 @@ -1,8 +1,10 @@ -
+ + + @@ -54,31 +56,65 @@ - + - + - - - + + - + - + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r cf92c7779a79 i18n/src/org/netbeans/modules/i18n/wizard/HardStringWizardPanel.java --- a/i18n/src/org/netbeans/modules/i18n/wizard/HardStringWizardPanel.java Fri Nov 14 17:47:30 2008 +0000 +++ b/i18n/src/org/netbeans/modules/i18n/wizard/HardStringWizardPanel.java Sat Nov 15 00:02:44 2008 +0000 @@ -65,10 +65,14 @@ import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.JTextField; +import javax.swing.event.ListSelectionEvent; import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.AbstractCellEditor; +import javax.swing.event.ListSelectionListener; +import javax.swing.text.Document; +import javax.swing.text.Position; import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.modules.i18n.HardCodedString; @@ -98,7 +102,7 @@ * @author Marian Petras * @see Panel */ -final class HardStringWizardPanel extends JPanel { +final class HardStringWizardPanel extends JPanel implements ListSelectionListener { /** Column index of check box column. */ private static final int COLUMN_INDEX_CHECK = 0; @@ -129,18 +133,29 @@ initAccessibility(); } + @Override + public void doLayout() { + super.doLayout(); + jSplitPane1.setDividerLocation(0.5D); + } + /** Sets combo model only for source which were some found strings in. */ private void setComboModel(Map sourceMap) { List nonEmptySources = new ArrayList(); - + String mimeType = null; for (Map.Entry entry : sourceMap.entrySet()) { if (!entry.getValue().getStringMap().isEmpty()) { nonEmptySources.add(entry.getKey()); + mimeType = entry.getKey().getPrimaryFile().getMIMEType(); } } sourceCombo.setModel(new DefaultComboBoxModel(nonEmptySources.toArray())); + if (mimeType != null) { + preview.setContentType(mimeType); + } + sourceComboActionPerformed(null); } /** Adds additional init of components. */ @@ -279,6 +294,7 @@ // PENDING: Setting the size of columns with check box and customize button editor. hardStringTable.getColumnModel().getColumn(COLUMN_INDEX_CHECK).setMaxWidth(30); hardStringTable.getColumnModel().getColumn(COLUMN_INDEX_CUSTOM).setMaxWidth(30); + hardStringTable.getSelectionModel().addListSelectionListener(this); } private void initAccessibility() { @@ -295,15 +311,18 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; sourceLabel = new javax.swing.JLabel(); sourceCombo = new javax.swing.JComboBox(); hardStringLabel = new javax.swing.JLabel(); + jSplitPane1 = new javax.swing.JSplitPane(); scrollPane = new javax.swing.JScrollPane(); hardStringTable = new javax.swing.JTable(); + jScrollPane1 = new javax.swing.JScrollPane(); + preview = new javax.swing.JEditorPane(); setLayout(new java.awt.GridBagLayout()); @@ -330,14 +349,25 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 0); add(hardStringLabel, gridBagConstraints); + + jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); + jSplitPane1.setResizeWeight(0.5); scrollPane.setPreferredSize(new java.awt.Dimension(100, 100)); hardStringTable.setModel(tableModel); scrollPane.setViewportView(hardStringTable); + + jSplitPane1.setLeftComponent(scrollPane); + + preview.setEditable(false); + jScrollPane1.setViewportView(preview); + + jSplitPane1.setRightComponent(jScrollPane1); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; @@ -345,8 +375,7 @@ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(5, 0, 0, 0); - add(scrollPane, gridBagConstraints); + add(jSplitPane1, gridBagConstraints); }// //GEN-END:initComponents private void sourceComboActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_sourceComboActionPerformed @@ -359,15 +388,36 @@ scrollPane.setViewportView(hardStringTable); tableModel.fireTableDataChanged(); } + SourceData data = sourceMap.get(sourceCombo.getSelectedItem()); + Document doc = data.getSupport().getDocument(); + preview.setDocument(doc); }//GEN-LAST:event_sourceComboActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JLabel hardStringLabel; private javax.swing.JTable hardStringTable; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JSplitPane jSplitPane1; + private javax.swing.JEditorPane preview; private javax.swing.JScrollPane scrollPane; private javax.swing.JComboBox sourceCombo; private javax.swing.JLabel sourceLabel; // End of variables declaration//GEN-END:variables + + public void valueChanged(ListSelectionEvent e) { + int ix = hardStringTable.getSelectedRow(); + if (ix >= 0) { + Object o = hardStringTable.getModel().getValueAt (ix, COLUMN_INDEX_HARDSTRING); + if (o instanceof HardCodedString) { + HardCodedString hard = (HardCodedString) o; + Position start = hard.getStartPosition(); + Position end = hard.getEndPosition(); + preview.setSelectionStart (start.getOffset()); + preview.setSelectionEnd(end.getOffset()); + } + } + } + // End of variables declaration /** Table model for this class. */ private class HardCodedStringTableModel extends AbstractTableModel {