Attachment #109795 for bug #156152

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 7-16 Link Here

(-)src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java (-3 / +68 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Trevor S. Kaufman <endante@gmail.com> - bug 156152
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.team.internal.ui.synchronize;	12	package org.eclipse.team.internal.ui.synchronize;
12		13
13	import com.ibm.icu.text.DateFormat;
14	import java.util.Date;	14	import java.util.Date;
15		15
16	import org.eclipse.core.runtime.jobs.Job;	16	import org.eclipse.core.runtime.jobs.Job;
Lines 20-25 Link Here
20	import org.eclipse.ui.IMemento;	20	import org.eclipse.ui.IMemento;
21	import org.eclipse.ui.actions.ActionFactory;	21	import org.eclipse.ui.actions.ActionFactory;
22		22
		23	import com.ibm.icu.text.DateFormat;
		24	import com.ibm.icu.util.Calendar;
		25
23	/**	26	/**
24	* Schedule to refresh a subscriber at a specified interval. The schedule can be disabled or enabled	27	* Schedule to refresh a subscriber at a specified interval. The schedule can be disabled or enabled
25	* and will create the refresh job.	28	* and will create the refresh job.
Lines 28-33 Link Here
28	*/	31	*/
29	public class SubscriberRefreshSchedule {	32	public class SubscriberRefreshSchedule {
30	private long refreshInterval = 3600; // 1 hour default	33	private long refreshInterval = 3600; // 1 hour default
		34	private Date refreshStart;
		35	private boolean runOnce = false;
31		36
32	private boolean enabled = false;	37	private boolean enabled = false;
33		38
Lines 46-51 Link Here
46	* Key for schedule in memento	51	* Key for schedule in memento
47	*/	52	*/
48	private static final String CTX_REFRESHSCHEDULE_ENABLED = TeamUIPlugin.ID + ".CTX_REFRESHSCHEDULE_ENABLED"; //$NON-NLS-1$	53	private static final String CTX_REFRESHSCHEDULE_ENABLED = TeamUIPlugin.ID + ".CTX_REFRESHSCHEDULE_ENABLED"; //$NON-NLS-1$
		54
		55	/**
		56	* Key for start date in memento
		57	*/
		58	private static final String CTX_REFRESHSCHEDULE_START = TeamUIPlugin.ID + ".CTX_REFRESHSCHEDULE_START"; //$NON-NLS-1$
		59
		60	/**
		61	* Key for run once in memento
		62	*/
		63	private static final String CTX_REFRESHSCHEDULE_RUNONCE = TeamUIPlugin.ID + ".CTX_REFRESHSCHEDULE_RUNONCE"; //$NON-NLS-1$
49		64
50	private IRefreshSubscriberListener refreshSubscriberListener = new IRefreshSubscriberListener() {	65	private IRefreshSubscriberListener refreshSubscriberListener = new IRefreshSubscriberListener() {
51	public void refreshStarted(IRefreshEvent event) {	66	public void refreshStarted(IRefreshEvent event) {
Lines 69-74 Link Here
69	public SubscriberRefreshSchedule(IRefreshable refreshable) {	84	public SubscriberRefreshSchedule(IRefreshable refreshable) {
70	this.refreshable = refreshable;	85	this.refreshable = refreshable;
71	RefreshParticipantJob.addRefreshListener(refreshSubscriberListener);	86	RefreshParticipantJob.addRefreshListener(refreshSubscriberListener);
		87
		88	Calendar cal = Calendar.getInstance();
		89	cal.clear();
		90	refreshStart = cal.getTime();
72	}	91	}
73		92
74	/**	93	/**
Lines 126-134 Link Here
126	}	145	}
127	job.setRefreshInterval(getRefreshInterval());	146	job.setRefreshInterval(getRefreshInterval());
128	job.setRestartOnCancel(true);	147	job.setRestartOnCancel(true);
129	job.setReschedule(true);	148	job.setReschedule(!runOnce);
130	// Schedule delay is in mills.	149	// Schedule delay is in mills.
131	job.schedule(getRefreshInterval() * 1000);	150	Calendar now = Calendar.getInstance();
		151	Calendar start = Calendar.getInstance();
		152	start.setTime(refreshStart);
		153	start.set(now.get(Calendar.YEAR), now.get(Calendar.MONTH), now.get(Calendar.DATE));
		154
		155	if (now.after(start)) {
		156	start.add(Calendar.DATE, 1);
		157	}
		158	long offset = start.getTimeInMillis() - now.getTimeInMillis();
		159	job.schedule(offset);
132	}	160	}
133		161
134	protected void stopJob() {	162	protected void stopJob() {
Lines 148-153 Link Here
148	public void saveState(IMemento memento) {	176	public void saveState(IMemento memento) {
149	memento.putString(CTX_REFRESHSCHEDULE_ENABLED, Boolean.toString(enabled));	177	memento.putString(CTX_REFRESHSCHEDULE_ENABLED, Boolean.toString(enabled));
150	memento.putInteger(CTX_REFRESHSCHEDULE_INTERVAL, (int)refreshInterval);	178	memento.putInteger(CTX_REFRESHSCHEDULE_INTERVAL, (int)refreshInterval);
		179	memento.putString(CTX_REFRESHSCHEDULE_START, Long.toString(refreshStart.getTime()));
		180	memento.putString(CTX_REFRESHSCHEDULE_RUNONCE, Boolean.toString(runOnce));
151	}	181	}
152		182
153	public static SubscriberRefreshSchedule init(IMemento memento, IRefreshable refreshable) {	183	public static SubscriberRefreshSchedule init(IMemento memento, IRefreshable refreshable) {
Lines 155-161 Link Here
155	if(memento != null) {	185	if(memento != null) {
156	String enabled = memento.getString(CTX_REFRESHSCHEDULE_ENABLED);	186	String enabled = memento.getString(CTX_REFRESHSCHEDULE_ENABLED);
157	int interval = memento.getInteger(CTX_REFRESHSCHEDULE_INTERVAL).intValue();	187	int interval = memento.getInteger(CTX_REFRESHSCHEDULE_INTERVAL).intValue();
		188	String startString = memento.getString(CTX_REFRESHSCHEDULE_START);
		189	String runOnce = memento.getString(CTX_REFRESHSCHEDULE_RUNONCE);
		190	if (startString != null) {
		191	long start = Long.parseLong(startString);
		192	schedule.setRefreshStartTime(new Date(start));
		193	}
158	schedule.setRefreshInterval(interval);	194	schedule.setRefreshInterval(interval);
		195	schedule.setRunOnce("true".equals(runOnce) ? true : false); //$NON-NLS-1$
159	schedule.setEnabled("true".equals(enabled) ? true : false, false /* don't start job */); //$NON-NLS-1$	196	schedule.setEnabled("true".equals(enabled) ? true : false, false /* don't start job */); //$NON-NLS-1$
160	}	197	}
161	// Use the defaults if a schedule hasn't been saved or can't be found.	198	// Use the defaults if a schedule hasn't been saved or can't be found.
Lines 212-215 Link Here
212	public IRefreshable getRefreshable() {	249	public IRefreshable getRefreshable() {
213	return refreshable;	250	return refreshable;
214	}	251	}
		252
		253	public Date getRefreshStartTime() {
		254	return refreshStart;
		255	}
		256
		257	public void setRefreshStartTime(Date refreshStart) {
		258	if(refreshStart != getRefreshStartTime()) {
		259	stopJob();
		260	this.refreshStart = refreshStart;
		261	if(isEnabled()) {
		262	startJob();
		263	}
		264	}
		265	}
		266
		267	public boolean getRunOnce() {
		268	return runOnce;
		269	}
		270
		271	public void setRunOnce(boolean runOnce) {
		272	if (runOnce != getRunOnce()) {
		273	startJob();
		274	this.runOnce = runOnce;
		275	if (isEnabled()) {
		276	startJob();
		277	}
		278	}
		279	}
215	}	280	}




 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Sebastian Davids <sdavids@gmx.de> - bug 54630
 *     Trevor S. Kaufman <endante@gmail.com> - bug 156152
 *******************************************************************************/
package org.eclipse.team.internal.ui.synchronize;

import java.util.Date;

import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;

import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.team.internal.ui.TeamUIMessages;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;

import com.ibm.icu.util.Calendar;

/**
 * A composite that allows editing a subscriber refresh schedule. A validator can be used to allow
 * containers to show page completion.

	private SubscriberRefreshSchedule schedule;
	private Button userRefreshOnly;
	private Button enableBackgroundRefresh;
	private Text timeInterval;
	private Combo hoursOrSeconds;
	private IPageValidator validator;
	private DateTime startTime;
	private Button immediately;
	private Button runOnce;
	
	public ConfigureSynchronizeScheduleComposite(Composite parent, SubscriberRefreshSchedule schedule, IPageValidator validator) {
		super(parent, SWT.NONE);

			hours = true;
		}		
		hoursOrSeconds.select(hours ? 0 : 1);
		timeInterval.setText(Long.toString(minutes));
		runOnce.setSelection(schedule.getRunOnce());
		
		Date start = schedule.getRefreshStartTime();
		Calendar cal = Calendar.getInstance();
		cal.setTime(start);
		startTime.setTime(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND));
	}

	/* (non-Javadoc)

			gridData.horizontalSpan = 2;
			composite.setLayoutData(gridData);
			final GridLayout gridLayout_1 = new GridLayout();
			gridLayout_1.numColumns = 4;
			gridLayout_1.marginWidth = 0;
			gridLayout_1.marginHeight = 0;
			gridLayout_1.horizontalSpacing = Dialog.convertHorizontalDLUsToPixels(fontMetrics, IDialogConstants.HORIZONTAL_SPACING);

			composite.setLayout(gridLayout_1);
			{
				final Label label = new Label(composite, SWT.NONE);
				label.setText(TeamUIMessages.ConfigureRefreshScheduleDialog_3a);
			}
			{
				startTime = new DateTime(composite, SWT.TIME | SWT.BORDER);
				final GridData gridData_1 = new GridData();
				gridData_1.horizontalSpan = 2;
				startTime.setLayoutData(gridData_1);
				
			}
			{
				immediately = new Button(composite, SWT.CHECK);
				immediately.setText(TeamUIMessages.ConfigureRefreshScheduleDialog_3b);
				immediately.addSelectionListener(new SelectionAdapter() {
					public void widgetSelected(SelectionEvent e) {
						updateEnablements();
					}
				});
			}
			{
				final Label label = new Label(composite, SWT.NONE);
				label.setText(TeamUIMessages.ConfigureRefreshScheduleDialog_4); 
			}
			{
				timeInterval = new Text(composite, SWT.BORDER | SWT.RIGHT);
				final GridData gridData_1 = new GridData();
				gridData_1.widthHint = 35;
				timeInterval.setLayoutData(gridData_1);
				timeInterval.addModifyListener(new ModifyListener() {
					public void modifyText(ModifyEvent e) {
						updateEnablements();
					}
				});
				timeInterval.addVerifyListener(new VerifyListener() {
					public void verifyText(VerifyEvent e) {
						String string = e.text;
						char [] chars = new char [string.length ()];

				hoursOrSeconds.setItems(new String[] { TeamUIMessages.ConfigureRefreshScheduleDialog_5, TeamUIMessages.ConfigureRefreshScheduleDialog_6 }); // 
				hoursOrSeconds.setLayoutData(new GridData());
			}
			{
				runOnce = new Button(composite, SWT.CHECK);
				runOnce.setText("Run Once"); //$NON-NLS-1$
				runOnce.addSelectionListener(new SelectionAdapter() {
					public void widgetSelected(SelectionEvent e) {
						updateEnablements();
					}
				});				
			}
		}
		initializeValues();
	}

	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
	 */
	public void saveValues() {
		if (!runOnce.getSelection()) {		
			int hours = hoursOrSeconds.getSelectionIndex();
			try {
				long seconds = Long.parseLong(timeInterval.getText());
				if(hours == 0) {
					seconds = seconds * 3600;
				} else {
					seconds = seconds * 60;
				}
				schedule.setRefreshInterval(seconds);
			} catch (NumberFormatException e) {
				// keep old value
			}
		} else {
			schedule.setRunOnce(runOnce.getSelection());
		}
		
		Calendar cal = Calendar.getInstance();
		if (! immediately.getSelection()) {
			cal.set(Calendar.HOUR_OF_DAY, startTime.getHours());
			cal.set(Calendar.MINUTE, startTime.getMinutes());
			cal.set(Calendar.SECOND, startTime.getSeconds());
		} else {
			cal.add(Calendar.SECOND, 1); // ensure time is today
		}
		schedule.setRefreshStartTime(cal.getTime());
		
		if(schedule.isEnabled() != enableBackgroundRefresh.getSelection()) {
			schedule.setEnabled(enableBackgroundRefresh.getSelection(), true /* allow to start */);
		}

			validator.setComplete(null);
		} else {
			try {
				long number = Long.parseLong(timeInterval.getText());
				if(number <= 0) {
					validator.setComplete(TeamUIMessages.ConfigureRefreshScheduleDialog_7); 
				} else {

				validator.setComplete(TeamUIMessages.ConfigureRefreshScheduleDialog_8); 
			}	
		}
		timeInterval.setEnabled(enableBackgroundRefresh.getSelection());
		hoursOrSeconds.setEnabled(enableBackgroundRefresh.getSelection());
		runOnce.setEnabled(enableBackgroundRefresh.getSelection());
		if (runOnce.isEnabled()) {
			timeInterval.setEnabled(!runOnce.getSelection());
			hoursOrSeconds.setEnabled(!runOnce.getSelection());
		}
		
		startTime.setEnabled(enableBackgroundRefresh.getSelection());
		immediately.setEnabled(enableBackgroundRefresh.getSelection());
		if (immediately.isEnabled()) {
			startTime.setEnabled(!immediately.getSelection());
		}
	}
	
	private Label createWrappingLabel(Composite parent, String text, int indent, int horizontalSpan) {

Lines 7-12 Link Here

(-)src/org/eclipse/team/internal/ui/messages.properties (-1 / +4 lines)
7	#	7	#
8	# Contributors:	8	# Contributors:
9	# IBM Corporation - initial API and implementation	9	# IBM Corporation - initial API and implementation
		10	# Trevor S. Kaufman - <endante@gmail.com> - bug 156152
10	###############################################################################	11	###############################################################################
11	###############################################	12	###############################################
12	# Message catalog for org.eclipse.team.ui	13	# Message catalog for org.eclipse.team.ui
Lines 239-245 Link Here
239	ConfigureMultipleProjectsWizard_1=There are still projects that have not been shared. Finishing the wizard now will leave them in that state.	240	ConfigureMultipleProjectsWizard_1=There are still projects that have not been shared. Finishing the wizard now will leave them in that state.
240	ConfigureRefreshScheduleDialog_2=Do not schedule the synchronize operation to run periodically.	241	ConfigureRefreshScheduleDialog_2=Do not schedule the synchronize operation to run periodically.
241	ConfigureRefreshScheduleDialog_3=Using the following schedule:	242	ConfigureRefreshScheduleDialog_3=Using the following schedule:
242	ConfigureRefreshScheduleDialog_4=Every:	243	ConfigureRefreshScheduleDialog_3a=Synchronize at:
		244	ConfigureRefreshScheduleDialog_3b=Immediately
		245	ConfigureRefreshScheduleDialog_4=Repeat Every:
243	ConfigureRefreshScheduleDialog_5=hour(s)	246	ConfigureRefreshScheduleDialog_5=hour(s)
244	ConfigureRefreshScheduleDialog_6=minute(s)	247	ConfigureRefreshScheduleDialog_6=minute(s)
245	ConfigureRefreshScheduleDialog_7=Number must be a positive number greater than 0	248	ConfigureRefreshScheduleDialog_7=Number must be a positive number greater than 0

Return to bug 156152

Lines 7-12 Link Here

(-)src/org/eclipse/team/internal/ui/TeamUIMessages.java (+3 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM - Initial API and implementation	9	* IBM - Initial API and implementation
		10	* Trevor S. Kaufman - <endante@gmail.com> - bug 156152
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.team.internal.ui;	12	package org.eclipse.team.internal.ui;
12		13
Lines 412-417 Link Here
412	public static String ConfigureRefreshScheduleDialog_1a;	413	public static String ConfigureRefreshScheduleDialog_1a;
413	public static String ConfigureRefreshScheduleDialog_2;	414	public static String ConfigureRefreshScheduleDialog_2;
414	public static String ConfigureRefreshScheduleDialog_3;	415	public static String ConfigureRefreshScheduleDialog_3;
		416	public static String ConfigureRefreshScheduleDialog_3a;
		417	public static String ConfigureRefreshScheduleDialog_3b;
415	public static String ConfigureRefreshScheduleDialog_4;	418	public static String ConfigureRefreshScheduleDialog_4;
416	public static String ConfigureRefreshScheduleDialog_5;	419	public static String ConfigureRefreshScheduleDialog_5;
417	public static String ConfigureRefreshScheduleDialog_6;	420	public static String ConfigureRefreshScheduleDialog_6;