From: yuki Date: Sat, 23 Feb 2008 10:07:54 +0000 (+0000) Subject: NicoContentから不要なフィールドを削除。 X-Git-Tag: rel20091113_ver0.1~35 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fb7e5ceb8be928d5229bf4edf1cdf5d878537dc5;p=coroid%2FNicoBrowser.git NicoContentから不要なフィールドを削除。 画面を削除。 上記に伴うエラー修正。 git-svn-id: http://192.168.11.7/svn/repository/NicoBrowserBranches/jpa/NicoBrowser@29 bdf3b611-c98c-6041-8292-703d9c9adbe7 --- diff --git a/src/nicobrowser/MainWindow.form b/src/nicobrowser/MainWindow.form deleted file mode 100644 index 170bae8..0000000 --- a/src/nicobrowser/MainWindow.form +++ /dev/null @@ -1,299 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/nicobrowser/MainWindow.java b/src/nicobrowser/MainWindow.java deleted file mode 100644 index b4c41fe..0000000 --- a/src/nicobrowser/MainWindow.java +++ /dev/null @@ -1,410 +0,0 @@ -/*$Id$*/ -/* - * MainWindow.java - * - * Created on 2008/01/05, 15:28 - */ -package nicobrowser; - -import java.awt.Component; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.Vector; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JTable; -import javax.swing.JTextArea; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.DefaultTableColumnModel; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableColumn; - -/** - * - * @author yuki - */ -public class MainWindow extends javax.swing.JFrame { - - private void setContents(List contList) { - int rowHeight = -1; - for (NicoContent cont : contList) { - Vector v = new Vector(); - ImageIcon icon = new ImageIcon(); - try { - icon = new ImageIcon(new URL(cont.getImageLink())); - if (rowHeight < 0) { - rowHeight = icon.getIconHeight(); - jTable1.setRowHeight(rowHeight); - } - } catch (MalformedURLException ex) { - Logger.getLogger(MainWindow.class.getName()).log(Level.SEVERE, null, "画像未取得" + cont.getTitle()); - } - v.add(icon); - v.add(cont.getTitle()); - v.add(cont.getDescription()); - v.add(cont.getPageLink()); - tableModel.addRow(v); - } - } - - private class MyTableModel extends DefaultTableModel { - - private MyTableModel(String[] COLUMN_NAMES, int i) { - super(COLUMN_NAMES, i); - } - - @Override - public Class getColumnClass(int columnIndex) { - return getValueAt(0, columnIndex).getClass(); - } - } - private static final String COLUMN_NAMES[] = {"サムネイル", "タイトル", "説明", "ページリンク"}; - private DefaultTableModel tableModel = new MyTableModel(COLUMN_NAMES, 0); - // private DefaultTableModel tableModel = new NicoTableModel; - /** Creates new form MainWindow */ - public MainWindow() { - initComponents(); - TableCellRenderer textAriaRenderer = new DefaultTableCellRenderer() { - - @Override - public Component getTableCellRendererComponent(JTable table, - Object value, - boolean isSelected, - boolean hasFocus, - int row, - int column) { - JTextArea comp = new JTextArea(value.toString()); - comp.setLineWrap(true); - return comp; - } - }; - TableCellRenderer buttonRenderer = new DefaultTableCellRenderer() { - - @Override - public Component getTableCellRendererComponent(JTable table, - Object value, - boolean isSelected, - boolean hasFocus, - int row, - int column) { - String[] splitted = value.toString().split("/"); - String text = ""; - if (splitted.length > 0) { - text = splitted[splitted.length - 1]; - } - JButton comp = new JButton(text); - return comp; - } - }; - - DefaultTableColumnModel cMoldel = (DefaultTableColumnModel) jTable1.getColumnModel(); - TableColumn c; - c = cMoldel.getColumn(1); - c.setCellRenderer(textAriaRenderer); - c = cMoldel.getColumn(2); - c.setCellRenderer(textAriaRenderer); - c = cMoldel.getColumn(3); - c.setCellRenderer(buttonRenderer); - - c = cMoldel.getColumn(0); - c.setPreferredWidth(130); - c = cMoldel.getColumn(1); - c.setPreferredWidth(100); - c = cMoldel.getColumn(2); - c.setPreferredWidth(400); - c = cMoldel.getColumn(3); - c.setPreferredWidth(110); - - } - - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. - */ - // //GEN-BEGIN:initComponents - private void initComponents() { - - jScrollPane1 = new javax.swing.JScrollPane(); - jTable1 = new javax.swing.JTable(); - jPanel2 = new javax.swing.JPanel(); - listLoadButton = new javax.swing.JButton(); - jLabel3 = new javax.swing.JLabel(); - listNoField = new javax.swing.JTextField(); - unitLoadButton = new javax.swing.JButton(); - jLabel4 = new javax.swing.JLabel(); - unitNoField = new javax.swing.JTextField(); - loadDailyListButton = new javax.swing.JButton(); - jPanel1 = new javax.swing.JPanel(); - jLabel1 = new javax.swing.JLabel(); - jLabel2 = new javax.swing.JLabel(); - mailField = new javax.swing.JTextField(); - passwordField = new javax.swing.JTextField(); - loginButton = new javax.swing.JButton(); - jPanel3 = new javax.swing.JPanel(); - clearButton = new javax.swing.JButton(); - - setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); - - jTable1.setModel(tableModel); - jTable1.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF); - jTable1.setEnabled(false); - jScrollPane1.setViewportView(jTable1); - - jPanel2.setBorder(javax.swing.BorderFactory.createEtchedBorder()); - - listLoadButton.setText("Load"); - listLoadButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - listLoadButtonActionPerformed(evt); - } - }); - - jLabel3.setText("ListNo"); - - listNoField.setText("1923688"); - - unitLoadButton.setText("Load"); - unitLoadButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - unitLoadButtonActionPerformed(evt); - } - }); - - jLabel4.setText("No"); - - unitNoField.setText("sm9"); - - loadDailyListButton.setText("Daily"); - loadDailyListButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - loadDailyListButtonActionPerformed(evt); - } - }); - - javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); - jPanel2.setLayout(jPanel2Layout); - jPanel2Layout.setHorizontalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(unitLoadButton, javax.swing.GroupLayout.Alignment.LEADING, 0, 0, Short.MAX_VALUE) - .addComponent(listLoadButton, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel3) - .addComponent(jLabel4)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(unitNoField) - .addComponent(listNoField, javax.swing.GroupLayout.DEFAULT_SIZE, 70, Short.MAX_VALUE)) - .addGap(18, 18, 18) - .addComponent(loadDailyListButton) - .addContainerGap(20, Short.MAX_VALUE)) - ); - jPanel2Layout.setVerticalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(listLoadButton) - .addComponent(jLabel3) - .addComponent(listNoField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(loadDailyListButton)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER) - .addComponent(jLabel4) - .addComponent(unitLoadButton) - .addComponent(unitNoField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - - jPanel1.setBorder(javax.swing.BorderFactory.createEtchedBorder()); - - jLabel1.setText("mail"); - - jLabel2.setText("password"); - - mailField.setEditable(false); - - passwordField.setEditable(false); - - loginButton.setText("LogIn"); - loginButton.setEnabled(false); - loginButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - loginButtonActionPerformed(evt); - } - }); - - javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); - jPanel1.setLayout(jPanel1Layout); - jPanel1Layout.setHorizontalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() - .addComponent(loginButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jLabel1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(mailField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel2) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(passwordField, javax.swing.GroupLayout.PREFERRED_SIZE, 151, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(31, Short.MAX_VALUE)) - ); - - jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {mailField, passwordField}); - - jPanel1Layout.setVerticalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(loginButton) - .addComponent(jLabel1) - .addComponent(mailField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel2) - .addComponent(passwordField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - - jPanel3.setBorder(javax.swing.BorderFactory.createEtchedBorder()); - - clearButton.setText("Clear"); - clearButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - clearButtonActionPerformed(evt); - } - }); - - javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); - jPanel3.setLayout(jPanel3Layout); - jPanel3Layout.setHorizontalGroup( - jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel3Layout.createSequentialGroup() - .addContainerGap() - .addComponent(clearButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); - jPanel3Layout.setVerticalGroup( - jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel3Layout.createSequentialGroup() - .addContainerGap() - .addComponent(clearButton) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 755, Short.MAX_VALUE) - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap()) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap() - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 271, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap()) - ); - - pack(); - }// //GEN-END:initComponents - private void listLoadButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_listLoadButtonActionPerformed - String no = listNoField.getText(); - if (no.length() < 1) { - return; - } - List contList = NicoHttpClient.getInstance().loadMyList(no); - setContents(contList); -}//GEN-LAST:event_listLoadButtonActionPerformed - - private void loginButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_loginButtonActionPerformed - String mail = mailField.getText(); - String password = passwordField.getText(); - if (mail.length() < 1 || password.length() < 1) { - //TODO エラー通知. - return; - } - NicoHttpClient.getInstance().login(mail, password); -}//GEN-LAST:event_loginButtonActionPerformed - - private void clearButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_clearButtonActionPerformed - int num = tableModel.getRowCount(); - for (int i = num - 1; i >= 0; i--) { - tableModel.removeRow(i); - } -}//GEN-LAST:event_clearButtonActionPerformed - - private void unitLoadButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_unitLoadButtonActionPerformed - String no = unitNoField.getText(); - if (no.length() < 1) { - return; - } - NicoContent cont = NicoHttpClient.getInstance().loadMyMovie(no); - List list = new ArrayList(); - list.add(cont); - setContents(list); -}//GEN-LAST:event_unitLoadButtonActionPerformed - - private void loadDailyListButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_loadDailyListButtonActionPerformed - List contList = NicoHttpClient.getInstance().loadMyListDaily(); - setContents(contList); - -}//GEN-LAST:event_loadDailyListButtonActionPerformed - - /** - * @param args the command line arguments - */ - public static void main(String args[]) { - java.awt.EventQueue.invokeLater(new Runnable() { - - public void run() { - new MainWindow().setVisible(true); - } - }); - } - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton clearButton; - private javax.swing.JLabel jLabel1; - private javax.swing.JLabel jLabel2; - private javax.swing.JLabel jLabel3; - private javax.swing.JLabel jLabel4; - private javax.swing.JPanel jPanel1; - private javax.swing.JPanel jPanel2; - private javax.swing.JPanel jPanel3; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JTable jTable1; - private javax.swing.JButton listLoadButton; - private javax.swing.JTextField listNoField; - private javax.swing.JButton loadDailyListButton; - private javax.swing.JButton loginButton; - private javax.swing.JTextField mailField; - private javax.swing.JTextField passwordField; - private javax.swing.JButton unitLoadButton; - private javax.swing.JTextField unitNoField; - // End of variables declaration//GEN-END:variables -} diff --git a/src/nicobrowser/NicoContent.java b/src/nicobrowser/NicoContent.java index 6f38ac1..c71d6d2 100644 --- a/src/nicobrowser/NicoContent.java +++ b/src/nicobrowser/NicoContent.java @@ -1,18 +1,13 @@ /*$Id$*/ package nicobrowser; -import java.util.Date; - /** * ニコニコ動画コンテンツ情報. */ public class NicoContent { private String pageLink; - private String imageLink; private String title; - private String description; - private Date publishedDate; public String getPageLink() { return pageLink; @@ -22,14 +17,6 @@ public class NicoContent { this.pageLink = pageLink; } - public String getImageLink() { - return imageLink; - } - - public void setImageLink(String imageLink) { - this.imageLink = imageLink; - } - public String getTitle() { return title; } @@ -38,22 +25,6 @@ public class NicoContent { this.title = title; } - void setDescription(String description) { - this.description = description; - } - - void setPublishedDate(Date publishedDate) { - this.publishedDate = publishedDate; - } - - public Date getPublishedDate() { - return publishedDate; - } - - public String getDescription() { - return description; - } - @Override public String toString() { return new String(getTitle() + ": " + getPageLink()); diff --git a/src/nicobrowser/NicoHttpClient.java b/src/nicobrowser/NicoHttpClient.java index cdd2eaf..9b48916 100644 --- a/src/nicobrowser/NicoHttpClient.java +++ b/src/nicobrowser/NicoHttpClient.java @@ -204,15 +204,9 @@ public class NicoHttpClient extends HttpClient { String watch_url = ((Element) element.getElementsByTagName("watch_url").item(0)).getFirstChild().getNodeValue(); cont.setPageLink(watch_url); - String thumbnail_url = ((Element) element.getElementsByTagName("thumbnail_url").item(0)).getFirstChild().getNodeValue(); - cont.setImageLink(thumbnail_url); - String title = ((Element) element.getElementsByTagName("title").item(0)).getFirstChild().getNodeValue(); cont.setTitle(title); - String description = ((Element) element.getElementsByTagName("description").item(0)).getFirstChild().getNodeValue(); - cont.setDescription(description); - // TODO 投稿日の設定 // String first_retrieve = ((Element) element.getElementsByTagName("first_retrieve").item(0)).getFirstChild().getNodeValue(); // cont.setPublishedDate(DateFormat.getInstance().parse(first_retrieve)); @@ -322,7 +316,6 @@ public class NicoHttpClient extends HttpClient { content.setTitle(entry.getTitle()); content.setPageLink(entry.getLink()); - content.setPublishedDate(entry.getPublishedDate()); // サムネイル画像リンクと説明文の取得 CallBack callBack = new CallBack(); @@ -334,8 +327,6 @@ public class NicoHttpClient extends HttpClient { Logger.getLogger(NicoHttpClient.class.getName()).log(Level.SEVERE, null, ex); } } - content.setImageLink(callBack.getImageLink()); - content.setDescription(callBack.getDescription()); // リストへ追加. contList.add(content);