Changeset 15143
- Timestamp:
- 07/04/08 12:48:31 (5 months ago)
- Location:
- platform/eclipse/sabotter/trunk
- Files:
-
- 7 added
- 26 modified
- 1 moved
-
jp.xet.sabotter.core/src/jp/xet/sabotter/core/MiniblogEntry.java (modified) (2 diffs)
-
jp.xet.sabotter.core/src/jp/xet/sabotter/core/mock/MockEntry.java (modified) (2 diffs)
-
jp.xet.sabotter.core/src/jp/xet/sabotter/core/mock/MockService.java (modified) (3 diffs)
-
jp.xet.sabotter.core/src/jp/xet/sabotter/core/twitter/TwitterAdapterWrapper.java (modified) (5 diffs)
-
jp.xet.sabotter.core/src/jp/xet/sabotter/core/twitter/TwitterDirectMessageEntry.java (modified) (3 diffs)
-
jp.xet.sabotter.core/src/jp/xet/sabotter/core/twitter/TwitterService.java (modified) (7 diffs)
-
jp.xet.sabotter.core/src/jp/xet/sabotter/core/twitter/TwitterStatusEntry.java (modified) (4 diffs)
-
jp.xet.sabotter.core/src/jp/xet/sabotter/core/wassr/WassrEntry.java (modified) (2 diffs)
-
jp.xet.sabotter.core/src/jp/xet/sabotter/core/wassr/WassrService.java (modified) (4 diffs)
-
jp.xet.sabotter.eclipse.service.mock/plugin.xml (modified) (1 diff)
-
jp.xet.sabotter.eclipse.service.mock/src/jp/xet/sabotter/eclipse/service/mock/MockPreferencePage.java (modified) (1 diff)
-
jp.xet.sabotter.eclipse.service.mock/src/jp/xet/sabotter/eclipse/service/mock/preferences (added)
-
jp.xet.sabotter.eclipse.service.mock/src/jp/xet/sabotter/eclipse/service/mock/preferences/MockPreferenceInitializer.java (added)
-
jp.xet.sabotter.eclipse.service.twitter/plugin.xml (modified) (1 diff)
-
jp.xet.sabotter.eclipse.service.twitter/src/jp/xet/sabotter/eclipse/service/twitter/TwitterPreferencePage.java (modified) (1 diff)
-
jp.xet.sabotter.eclipse.service.twitter/src/jp/xet/sabotter/eclipse/service/twitter/preferences (added)
-
jp.xet.sabotter.eclipse.service.twitter/src/jp/xet/sabotter/eclipse/service/twitter/preferences/TwitterPreferenceInitializer.java (added)
-
jp.xet.sabotter.eclipse.service.wassr/plugin.xml (modified) (1 diff)
-
jp.xet.sabotter.eclipse.service.wassr/src/jp/xet/sabotter/eclipse/service/wassr/WassrPreferencePage.java (modified) (1 diff)
-
jp.xet.sabotter.eclipse.service.wassr/src/jp/xet/sabotter/eclipse/service/wassr/preferences (added)
-
jp.xet.sabotter.eclipse.service.wassr/src/jp/xet/sabotter/eclipse/service/wassr/preferences/WassrPreferenceInitializer.java (added)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/action/CreateFavoriteAction.java (modified) (4 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/action/ReloadTimeLineAction.java (modified) (2 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/manager/MiniblogServiceManager.java (modified) (10 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/preferences/AbstractServiceCommonPreferenceInitializer.java (added)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/preferences/AbstractServiceCommonPreferencePage.java (moved) (moved from platform/eclipse/sabotter/trunk/jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/preferences/MiniblogServicePreferencePage.java) (3 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/preferences/BaloonDispayType.java (modified) (3 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/preferences/SabotterPreference.java (modified) (3 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/preferences/SabotterPreferenceImpl.java (modified) (3 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/preferences/SabotterPreferenceInitializer.java (modified) (2 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/views/LabelProcessor.java (modified) (4 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/views/SabotterView.java (modified) (6 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/views/TimeLineContentProvider.java (modified) (4 diffs)
-
jp.xet.sabotter.eclipse/src/jp/xet/sabotter/eclipse/views/listeners/StatusTextModifyListener.java (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
platform/eclipse/sabotter/trunk/jp.xet.sabotter.core/src/jp/xet/sabotter/core/MiniblogEntry.java
r15108 r15143 14 14 /** 15 15 * サービスIDを取得する。 16 * 16 17 * @return サービスID 17 18 */ … … 72 73 * 73 74 * ダイレクトメッセージであれば、常に<code>true</code>を返す。 74 * @param myId75 75 * 76 76 * @return 自分宛返信であれば<code>true</code> 77 77 */ 78 boolean isMessageToMe( String myId);78 boolean isMessageToMe(); 79 79 80 80 /** 81 81 * 自分によるEntryかどうかを調べる。 82 * @param myId82 * 83 83 * 84 84 * @return 自分によるEntryであれば<code>true</code> 85 85 */ 86 boolean isMyEntry( String myId);86 boolean isMyEntry(); 87 87 } -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.core/src/jp/xet/sabotter/core/mock/MockEntry.java
r15108 r15143 88 88 * {@inheritDoc} 89 89 */ 90 public boolean isMessageToMe( String myId) {91 return getText().contains("@" + myId);90 public boolean isMessageToMe() { 91 return getText().contains("@" + this.user.getUserId()); 92 92 } 93 93 … … 95 95 * {@inheritDoc} 96 96 */ 97 public boolean isMyEntry( String myId) {98 return user.getUserId().equals( myId);97 public boolean isMyEntry() { 98 return user.getUserId().equals(this.user.getUserId()); 99 99 } 100 100 -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.core/src/jp/xet/sabotter/core/mock/MockService.java
r15114 r15143 20 20 */ 21 21 public class MockService implements MiniblogService { 22 23 public static final String SERVICE_ID = "Mock"; 22 24 23 25 private int nextId = 1000; … … 91 93 */ 92 94 public String getServiceId() { 93 return "Mock";95 return SERVICE_ID; 94 96 } 95 97 … … 197 199 for (int i = 0; i < num; i++) { 198 200 miniblogEntry = createDummyEntry(new Date(prev.getTime() + (10000 * i)), false); 199 if (miniblogEntry.isMessageToMe( user.getUserId())) {201 if (miniblogEntry.isMessageToMe()) { 200 202 add(replies, miniblogEntry); 201 203 } -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.core/src/jp/xet/sabotter/core/twitter/TwitterAdapterWrapper.java
r15107 r15143 24 24 private MiniblogServiceResponceListener listener; 25 25 26 private String userId; 27 26 28 27 29 /** 28 30 * コンストラクタ。 29 31 * 32 * @param userId サービスを利用中のuserId 30 33 * @param listener 31 34 */ 32 public TwitterAdapterWrapper(MiniblogServiceResponceListener listener ) {35 public TwitterAdapterWrapper(MiniblogServiceResponceListener listener, String userId) { 33 36 this.listener = listener; 37 this.userId = userId; 34 38 } 35 39 … … 44 48 45 49 for (Status status : statuses) { 46 wrapList.add(new TwitterStatusEntry(status ));50 wrapList.add(new TwitterStatusEntry(status, this.userId)); 47 51 } 48 52 … … 60 64 61 65 for (DirectMessage message : messages) { 62 wrapList.add(new TwitterDirectMessageEntry(message ));66 wrapList.add(new TwitterDirectMessageEntry(message, this.userId)); 63 67 } 64 68 … … 76 80 77 81 for (Status status : statuses) { 78 wrapList.add(new TwitterStatusEntry(status ));82 wrapList.add(new TwitterStatusEntry(status, this.userId)); 79 83 } 80 84 … … 90 94 public void onException(TwitterException ex, int method) { 91 95 // FIXME 92 // if (ex.getStatusCode() == 400) { // タイムライン取得制限93 // SabotterPlugin.handleException(ex, SabotterPlugin.DIALOG, "API limit rate over.");94 // }95 // ex.printStackTrace();96 // if (ex.getStatusCode() == 400) { // タイムライン取得制限 97 // SabotterPlugin.handleException(ex, SabotterPlugin.DIALOG, "API limit rate over."); 98 // } 99 // ex.printStackTrace(); 96 100 this.listener.onException(new MiniblogServiceException(ex), method); 97 101 } -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.core/src/jp/xet/sabotter/core/twitter/TwitterDirectMessageEntry.java
r15090 r15143 18 18 private DirectMessage directMessage; 19 19 20 private String userId; 21 20 22 21 23 /** 22 24 * コンストラクタ。 23 25 * 26 * @param userId サービスを利用中のID 24 27 * @param directMessage 25 28 */ 26 public TwitterDirectMessageEntry(DirectMessage directMessage ) {29 public TwitterDirectMessageEntry(DirectMessage directMessage, String userId) { 27 30 this.directMessage = directMessage; 31 this.userId = userId; 28 32 } 29 33 … … 80 84 * {@inheritDoc} 81 85 */ 82 public boolean isMessageToMe( String myId) {86 public boolean isMessageToMe() { 83 87 return true; 84 88 } … … 87 91 * {@inheritDoc} 88 92 */ 89 public boolean isMyEntry( String myId) {90 return directMessage.getSender().getScreenName().equals( myId);93 public boolean isMyEntry() { 94 return directMessage.getSender().getScreenName().equals(this.userId); 91 95 } 92 96 -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.core/src/jp/xet/sabotter/core/twitter/TwitterService.java
r15114 r15143 21 21 22 22 private PatentAsyncTwitterImpl twitter; 23 24 /** ツイッターサービスの ID です */ 25 public static final String SERVICE_ID = "Twitter"; 23 26 24 27 … … 71 74 */ 72 75 public String getServiceId() { 73 return "Twitter";76 return SERVICE_ID; 74 77 } 75 78 … … 78 81 */ 79 82 public final void createFavorite(String statusId, MiniblogServiceResponceListener listener) { 80 this.twitter.createFavoriteAsync(Integer.parseInt(statusId), new TwitterAdapterWrapper(listener)); 83 this.twitter.createFavoriteAsync(Integer.parseInt(statusId), new TwitterAdapterWrapper(listener, twitter 84 .getUserId())); 81 85 } 82 86 … … 86 90 public final void getFriendsTimeline(MiniblogServiceResponceListener listener) { 87 91 // this.twitter.verifyCredentials(); 88 this.twitter.getFriendsTimelineAsync(new TwitterAdapterWrapper(listener ));92 this.twitter.getFriendsTimelineAsync(new TwitterAdapterWrapper(listener, twitter.getUserId())); 89 93 } 90 94 … … 94 98 public MiniblogEntry update(String statusText) throws MiniblogServiceException { 95 99 try { 96 return new TwitterStatusEntry(this.twitter.update(statusText) );100 return new TwitterStatusEntry(this.twitter.update(statusText), twitter.getUserId()); 97 101 } catch (TwitterException e) { 98 102 throw new MiniblogServiceException(e); … … 115 119 */ 116 120 public void getReplies(MiniblogServiceResponceListener listener) { 117 twitter.getRepliesAsync(new TwitterAdapterWrapper(listener ));121 twitter.getRepliesAsync(new TwitterAdapterWrapper(listener, twitter.getUserId())); 118 122 } 119 123 … … 124 128 */ 125 129 public void getDirectMessages(MiniblogServiceResponceListener listener) { 126 twitter.getDirectMessagesAsync(new TwitterAdapterWrapper(listener ));130 twitter.getDirectMessagesAsync(new TwitterAdapterWrapper(listener, twitter.getUserId())); 127 131 } 128 132 -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.core/src/jp/xet/sabotter/core/twitter/TwitterStatusEntry.java
r15108 r15143 15 15 /** 16 16 * TODO describe 17 * 17 18 * @author daisuke 18 19 */ … … 22 23 private Status status; 23 24 25 private String userId; 26 24 27 25 28 /** 26 29 * コンストラクタ。 27 30 * 31 * @param userId サービスを利用中の人の iD 28 32 * @param status 29 33 */ 30 public TwitterStatusEntry(Status status ) {34 public TwitterStatusEntry(Status status, String userId) { 31 35 this.status = status; 36 this.userId = userId; 32 37 } 33 38 … … 80 85 * {@inheritDoc} 81 86 */ 82 public boolean isMessageToMe( String myId) {83 return getText().contains("@" + myId);87 public boolean isMessageToMe() { 88 return getText().contains("@" + this.userId); 84 89 } 85 90 … … 87 92 * {@inheritDoc} 88 93 */ 89 public boolean isMyEntry( String myId) {90 return status.getUser().getScreenName().equals( myId);94 public boolean isMyEntry() { 95 return status.getUser().getScreenName().equals(this.userId); 91 96 } 92 97 -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.core/src/jp/xet/sabotter/core/wassr/WassrEntry.java
r15114 r15143 99 99 * {@inheritDoc} 100 100 */ 101 public boolean isMessageToMe( String myId) {101 public boolean isMessageToMe() { 102 102 return isMessageToMe; 103 103 } … … 106 106 * {@inheritDoc} 107 107 */ 108 public boolean isMyEntry( String myId) {108 public boolean isMyEntry() { 109 109 return isMyEntry; 110 110 } -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.core/src/jp/xet/sabotter/core/wassr/WassrService.java
r15114 r15143 34 34 private String myId; 35 35 36 /** wassr サービスの ID です */ 37 public static final String SERVICE_ID = "Wassr"; 38 36 39 37 40 /** … … 47 50 */ 48 51 public String getServiceId() { 49 return "Wassr";52 return SERVICE_ID; 50 53 } 51 54 … … 54 57 */ 55 58 public void setAccount(String userId, String password) { 56 // TODO! 59 client.setUserId(userId); 60 client.setPassword(password); 57 61 } 58 62 … … 60 64 * {@inheritDoc} 61 65 */ 62 public void changeAccount(String user name, String password) {63 // TODO Auto-generated method stub64 66 public void changeAccount(String userId, String password) { 67 client.setUserId(userId); 68 client.setPassword(password); 65 69 } 66 70 -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.eclipse.service.mock/plugin.xml
r15101 r15143 12 12 <page 13 13 class="jp.xet.sabotter.eclipse.service.mock.MockPreferencePage" 14 id="jp.xet.sabotter.preference. twitter"14 id="jp.xet.sabotter.preference.mock" 15 15 category="jp.xet.sabotter.preference" 16 name=" Twitter"/>16 name="Mock"/> 17 17 </extension> 18 18 <extension 19 19 point="org.eclipse.core.runtime.preferences"> 20 <initializer class="jp.xet.sabotter.eclipse.service.mock.preferences.MockPreferenceInitializer"/> 20 21 </extension> 21 22 </plugin> -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.eclipse.service.mock/src/jp/xet/sabotter/eclipse/service/mock/MockPreferencePage.java
r15114 r15143 1 1 package jp.xet.sabotter.eclipse.service.mock; 2 2 3 import jp.xet.sabotter.core.mock.MockService; 3 4 import jp.xet.sabotter.eclipse.SabotterPlugin; 4 import jp.xet.sabotter.eclipse.preferences.BaloonDispayType; 5 import jp.xet.sabotter.eclipse.preferences.MiniblogServicePreferencePage; 6 import jp.xet.sabotter.eclipse.preferences.PreferenceKeys; 7 import jp.xet.sabotter.eclipse.preferences.SabotterPreferenceInitializer; 8 9 import org.eclipse.jface.preference.IPreferenceStore; 5 import jp.xet.sabotter.eclipse.preferences.AbstractServiceCommonPreferencePage; 6 import jp.xet.sabotter.eclipse.service.mock.preferences.MockPreferenceInitializer; 10 7 11 8 /** 12 * Twitter用設定ページクラス。 UNDONE 未実装9 * Mock用設定ページクラス。 UNDONE 未実装 13 10 * 14 11 * @author daisuke 15 12 */ 16 public class MockPreferencePage extends MiniblogServicePreferencePage {13 public class MockPreferencePage extends AbstractServiceCommonPreferencePage { 17 14 15 /** 16 * {@inheritDoc} 17 */ 18 18 @Override 19 protected void setCurrentValueToControls() { 20 IPreferenceStore ps = SabotterPlugin.getDefault().getPreferenceStore(); 21 txtUsername.setText(ps.getString(PreferenceKeys.USERID)); 22 txtPassword.setText(ps.getString(PreferenceKeys.PASSWORD)); 23 24 spnAPILimitRate.setSelection(ps.getInt(PreferenceKeys.API_LIMIT_RATE)); 25 spnAPILimitRate.addSelectionListener(intervalListener); 26 spnTimeLineInterval.setSelection(ps.getInt(PreferenceKeys.INTERVAL_FRIEND_TIMELINE)); 27 spnTimeLineInterval.addSelectionListener(intervalListener); 28 spnRepliesInterval.setSelection(ps.getInt(PreferenceKeys.INTERVAL_REPLIES)); 29 spnRepliesInterval.addSelectionListener(intervalListener); 30 spnDirectMessagesInterval.setSelection(ps.getInt(PreferenceKeys.INTERVAL_DIRECT_MESSAGES)); 31 spnDirectMessagesInterval.addSelectionListener(intervalListener); 19 public String getServiceId() { 20 return MockService.SERVICE_ID; 32 21 } 33 22 23 /** 24 * {@inheritDoc} 25 */ 34 26 @Override 35 protected void loadDefaultValues() { 36 IPreferenceStore ps = SabotterPlugin.getDefault().getPreferenceStore(); 37 ps.setValue(PreferenceKeys.USERID, SabotterPreferenceInitializer.DEF_USERNAME); 38 ps.setValue(PreferenceKeys.PASSWORD, SabotterPreferenceInitializer.DEF_PASSWORD); 39 ps.setValue(PreferenceKeys.API_LIMIT_RATE, 30); 40 ps.setValue(PreferenceKeys.INTERVAL_FRIEND_TIMELINE, 5); 41 ps.setValue(PreferenceKeys.INTERVAL_REPLIES, 12); 42 ps.setValue(PreferenceKeys.INTERVAL_DIRECT_MESSAGES, 20); 43 ps.setValue(PreferenceKeys.BALOON_DISPLAY_TYPE, BaloonDispayType.ALL.toString()); 27 public void loadServiceOwnDefaultValues() { 28 MockPreferenceInitializer.init(SabotterPlugin.getDefault().getPreferenceStore(), getServiceId()); 44 29 } 45 46 @Override47 protected void storeValues() {48 IPreferenceStore ps = SabotterPlugin.getDefault().getPreferenceStore();49 ps.setValue(PreferenceKeys.USERID, txtUsername.getText());50 ps.setValue(PreferenceKeys.PASSWORD, txtPassword.getText());51 52 int apiLimitRate = spnAPILimitRate.getSelection();53 ps.setValue(PreferenceKeys.API_LIMIT_RATE, apiLimitRate);54 55 int timeLineInterval = spnTimeLineInterval.getSelection();56 ps.setValue(PreferenceKeys.INTERVAL_FRIEND_TIMELINE, timeLineInterval);57 58 int replyInterval = spnRepliesInterval.getSelection();59 ps.setValue(PreferenceKeys.INTERVAL_REPLIES, replyInterval);60 61 int dmInterval = spnDirectMessagesInterval.getSelection();62 ps.setValue(PreferenceKeys.INTERVAL_DIRECT_MESSAGES, dmInterval);63 }64 65 30 } -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.eclipse.service.twitter/plugin.xml
r15101 r15143 18 18 <extension 19 19 point="org.eclipse.core.runtime.preferences"> 20 <initializer class="jp.xet.sabotter.eclipse.service.twitter.preferences.TwitterPreferenceInitializer"/> 20 21 </extension> 21 22 </plugin> -
platform/eclipse/sabotter/trunk/jp.xet.sabotter.eclipse.service.twitter/src/jp/xet/sabotter/eclipse/service/twitter/TwitterPreferencePage.java
r15114
![(please configure the [header_logo] section in trac.ini)](/share/chrome/site/your_project_logo.png)