Commits

Colin Gordon committed 82457f1

22

  • Participants
  • Parent commits 67a369b

Comments (0)

Files changed (7)

.results.txt.swp

Binary file modified.
 +30 (16:55): 28
 +5 (17:00): 27
 +15 (17:15): 26
++5 (17:20): 22 - DONE

src/.log.txt.swp

Binary file modified.
 			                                 ^
   found   : ? extends @AlwaysSafe Object
   required: @AlwaysSafe String
-subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber/MarkMergedSynchronizeOperation.java:160: error: Calling a method with UIEffect effect from a context limited to SafeEffect effects.
-				BusyIndicator.showWhile(Display.getCurrent(), new @UI Runnable() {
-				                       ^
-subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber/MarkMergedSynchronizeOperation.java:174: error: Calling a method with UIEffect effect from a context limited to SafeEffect effects.
-				new ProgressMonitorDialog(getShell()).run(true, cancelable,/*cancelable, true, */innerRunnable);	
-				                                         ^
-subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber/SVNChangeSetCollector.java:293: error: An method override may only be @UI if it overrides an @UI method (overriding org.eclipse.team.internal.core.subscribers.ChangeSetManager.initializeSets()).
-	protected void initializeSets() {
-	               ^
-subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber/OverrideAndUpdateSynchronizeOperation.java:50: error: Calling a method with UIEffect effect from a context limited to SafeEffect effects.
-		super(configuration, elements);
-		     ^
 Note: Some input files use or override a deprecated API.
 Note: Recompile with -Xlint:deprecation for details.
 Note: Some input files use unchecked or unsafe operations.
 Note: Recompile with -Xlint:unchecked for details.
-26 errors
+22 errors
 14 warnings

src/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber/MarkMergedSynchronizeOperation.java

         return true;
     }
 
-    protected void run(SVNTeamProvider provider, SyncInfoSet set, final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+    @UIEffect protected void run(SVNTeamProvider provider, SyncInfoSet set, final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
         final IResource[] resources = set.getResources();
         run(new WorkspaceModifyOperation() {
             protected void execute(IProgressMonitor mon) throws CoreException, InvocationTargetException, InterruptedException {
         }
 	}    
     
-	final protected void run(final IRunnableWithProgress runnable, boolean cancelable, int progressKind) throws InvocationTargetException, InterruptedException {
+	@UIEffect final protected void run(final IRunnableWithProgress runnable, boolean cancelable, int progressKind) throws InvocationTargetException, InterruptedException {
 		final Exception[] exceptions = new Exception[] {null};
 		
 		// Ensure that no repository view refresh happens until after the action

src/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber/OverrideAndUpdateSynchronizeOperation.java

 	public final static int PROGRESS_DIALOG = 1;
 	public final static int PROGRESS_BUSYCURSOR = 2;
 
-	public OverrideAndUpdateSynchronizeOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements, IResource[] modifiedResources, IResource[] resources) {
+	@UIEffect public OverrideAndUpdateSynchronizeOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements, IResource[] modifiedResources, IResource[] resources) {
 		super(configuration, elements);
 		this.modifiedResources = modifiedResources;
 		this.resources = resources;

src/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber/SVNChangeSetCollector.java

 	 * (non-Javadoc)
 	 * @see org.eclipse.team.internal.core.subscribers.ChangeSetManager#initializeSets()
 	 */
-	protected void initializeSets() {
+	@SafeEffect protected void initializeSets() {
 		// Nothing to initialize
 	}