Attachment #116810 for bug #209673

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 209673
Collapse All | Expand All




        
        <change>
            <api name="versioning_spi"/>
            <summary>Added VCSHistoryProvider.HistoryEntry.getParent()</summary>
            <version major="1" minor="30"/>
            <date day="23" month="3" year="2012"/>
            <author login="tstupka"/>
            <compatibility addition="yes"/>
            <description>
                New method <code>VCSHistoryProvider.HistoryEntry.getParent()</code> to provide the 
                <code>VCSHistoryProvider.HistoryEntry</code> representing the parent of the given revision.
            </description>
            <class package="org.netbeans.modules.versioning.spi" name="VersioningSupport"/>
            <issue number="209673"/>
        </change>                
        <change>
            <api name="versioning_spi"/>
            <summary>Added VCSHistoryProvider</summary>
            <version major="1" minor="29"/>
            <date day="30" month="1" year="2012"/>

Lines 44-50 Link Here

(-)versioning/nbproject/project.properties (-1 / +1 lines)
44	javac.source=1.6	44	javac.source=1.6
45		45
46	javadoc.name=Versioning	46	javadoc.name=Versioning
47	spec.version.base=1.29.0	47	spec.version.base=1.30.0
48	is.autoload=true	48	is.autoload=true
49		49
50	javadoc.arch=${basedir}/arch.xml	50	javadoc.arch=${basedir}/arch.xml

Lines 45-50 Link Here

(-)versioning/src/org/netbeans/modules/versioning/Accessor.java (+3 lines)
45		45
46	import org.netbeans.modules.versioning.spi.VCSContext;	46	import org.netbeans.modules.versioning.spi.VCSContext;
47	import org.netbeans.modules.versioning.spi.VCSHistoryProvider;	47	import org.netbeans.modules.versioning.spi.VCSHistoryProvider;
		48	import org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry;
		49	import org.netbeans.modules.versioning.spi.VCSHistoryProvider.ParentProvider;
48		50
49		51
50	/**	52	/**
Lines 72-75 Link Here
72		74
73	public abstract VCSHistoryProvider.RevisionProvider getRevisionProvider(VCSHistoryProvider.HistoryEntry entry);	75	public abstract VCSHistoryProvider.RevisionProvider getRevisionProvider(VCSHistoryProvider.HistoryEntry entry);
74	public abstract VCSHistoryProvider.MessageEditProvider getMessageEditProvider(VCSHistoryProvider.HistoryEntry entry);	76	public abstract VCSHistoryProvider.MessageEditProvider getMessageEditProvider(VCSHistoryProvider.HistoryEntry entry);
		77	public abstract ParentProvider getParentProvider(HistoryEntry entry);
75	}	78	}




            HistoryEntry[] proxyHistory = new HistoryEntry[history.length];
            for (int i = 0; i < proxyHistory.length; i++) {
                final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he = history[i];
                proxyHistory[i] = delegateHistoryEntry(proxies, he);
            }
            return proxyHistory;
        }

                    @Override
        public Action createShowHistoryAction(VCSFileProxy[] proxies) {
            File[] files = toFiles(proxies);
            return getDelegate().getVCSHistoryProvider().createShowHistoryAction(files);
        }

        private MessageEditProvider delegateMessageEditProvider(final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he) {
            if(he.canEdit()) {
                return new MessageEditProvider() {
                    @Override
                    public void setMessage(String message) throws IOException {
                        org.netbeans.modules.versioning.spi.VCSHistoryProvider.MessageEditProvider provider = Accessor.IMPL.getMessageEditProvider(he);
                        if(provider != null) {
                            provider.setMessage(message);
                        }
                    }
                };
            }
            return null;
        }

        private RevisionProvider delegateRevisionProvider(final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he) {
            return new RevisionProvider() {
                @Override
                    public void getRevisionFile(VCSFileProxy originalFile, VCSFileProxy revisionFile) {
                        org.netbeans.modules.versioning.spi.VCSHistoryProvider.RevisionProvider provider = Accessor.IMPL.getRevisionProvider(he);
                        if(provider != null) {

                        }
                    }
                };
        }

        private ParentProvider delegateParentProvider(final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he) {
            return new ParentProvider() {
                        @Override
                public HistoryEntry getParentEntry() {
                    org.netbeans.modules.versioning.spi.VCSHistoryProvider.ParentProvider provider = Accessor.IMPL.getParentProvider(he);
                            if(provider != null) {
                            org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he = provider.getParentEntry();
                            if(he != null) {
                                return delegateHistoryEntry(toProxies(he.getFiles()), he);
                            }
                        }
                    return null;
                }
                    };
                }

        private HistoryEntry delegateHistoryEntry(VCSFileProxy[] proxies, final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he) {
            return new HistoryEntry(
                        proxies, 
                        he.getDateTime(), 
                        he.getMessage(), 

                        he.getRevision(), 
                        he.getRevisionShort(), 
                        he.getActions(), 
                        delegateRevisionProvider(he),
                        delegateMessageEditProvider(he), 
                        delegateParentProvider(he));
            }
            return proxyHistory;
        }

        @Override
        public Action createShowHistoryAction(VCSFileProxy[] proxies) {
            File[] files = toFiles(proxies);
            return getDelegate().getVCSHistoryProvider().createShowHistoryAction(files);
        }

        private class DelegateChangeListener implements org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryChangeListener {
            private final VCSHistoryProvider.HistoryChangeListener delegate;
            public DelegateChangeListener(HistoryChangeListener delegate) {

Lines 46-51 Link Here

(-)versioning/src/org/netbeans/modules/versioning/spi/AccessorImpl.java (+6 lines)
46	import org.netbeans.modules.versioning.Accessor;	46	import org.netbeans.modules.versioning.Accessor;
47	import org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry;	47	import org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry;
48	import org.netbeans.modules.versioning.spi.VCSHistoryProvider.MessageEditProvider;	48	import org.netbeans.modules.versioning.spi.VCSHistoryProvider.MessageEditProvider;
		49	import org.netbeans.modules.versioning.spi.VCSHistoryProvider.ParentProvider;
49	import org.netbeans.modules.versioning.spi.VCSHistoryProvider.RevisionProvider;	50	import org.netbeans.modules.versioning.spi.VCSHistoryProvider.RevisionProvider;
50		51
51	/**	52	/**
Lines 70-74 Link Here
70	return entry.getMessageEditProvider();	71	return entry.getMessageEditProvider();
71	}	72	}
72		73
		74	@Override
		75	public ParentProvider getParentProvider(HistoryEntry entry) {
		76	return entry.getParentProvider();
		77	}
73		78
		79
74	}	80	}




        private Action[] actions;
        private RevisionProvider revisionProvider;
        private MessageEditProvider messageEditProvider;
        private ParentProvider parentProvider;
        
        /**
         * Creates a new HistoryEntry instance.

        }
        
        /**
         * Creates a new HistoryEntry instance.
         * 
         * @param files involved files
         * @param dateTime the date and time when the versioning revision was created
         * @param message the message describing the versioning revision 
         * @param username full description of the user who created the versioning revision 
         * @param usernameShort short description of the user who created the versioning revision 
         * @param revision full description of the versioning revision
         * @param revisionShort short description of the versioning revision
         * @param actions actions which might be called in regard with this revision
         * @param revisionProvider a RevisionProvider to get access to a files contents in this revision
         * @param messageEditProvider a MessageEditProvider to change a revisions message
         * @param parentProvider a ParentProvider to provide this entries parent entry. Not necessary for VCS
         * where a revisions parent always is the time nearest previous revision.
         * 
         * @since 1.30
         */
        public HistoryEntry(
                File[] files, 
                Date dateTime, 
                String message, 
                String username, 
                String usernameShort, 
                String revision, 
                String revisionShort, 
                Action[] actions, 
                RevisionProvider revisionProvider,
                MessageEditProvider messageEditProvider,
                ParentProvider parentProvider) 
        {
            this(files, dateTime, message, username, usernameShort, revision, revisionShort, actions, revisionProvider, messageEditProvider);
            this.parentProvider = parentProvider;
        }
        
        /**
         * Determines if this HistoryEntry instance supports changes.
         * 
         * @return true if it is possible to access setter methods in this instance

        }
        
        /**
         * Returns this revisions parent entry or null if not available.
         * 
         * @return this revisions parent entry
         * 
         * @since 1.30
         */
        public HistoryEntry getParentEntry() {
            if(parentProvider != null) {
                return parentProvider.getParentEntry();
            } 
            return null;
        }
        
        /**
         * Returns the RevisionProvider
         * @return the RevisionProvider
         */

        MessageEditProvider getMessageEditProvider() {
            return messageEditProvider;
        }

        /**
         * Returns the ParentProvider or null 
         * @return the ParentProvider
         */        
        ParentProvider getParentProvider() {
            return parentProvider;
    }
    }
    
    /**
     * Adds a listener for history change events.

    }
    
    /**
     * Implement and pass over to a {@link HistoryEntry} in case you want 
     * {@link HistoryEntry#getParentProvider()} to return relevant values.
     * 
     * @since 1.30
     */
    public interface ParentProvider {
        /**
         * Return a {@link HistoryEntry} representing the parent of the {@link HistoryEntry}
         * configured with this ParentProvider.
         * 
         * @return the parent HistoryEntry
         * @since 1.30
         */
        HistoryEntry getParentEntry();
    }
    
    /**
     * Implement and pass over to {@link HistoryEntry} in case 
     * {@link HistoryEntry#setMessage(java.lang.String)}
     * is expected to work.




import org.netbeans.modules.versioning.spi.testvcs.TestVCSHistoryProvider;

import org.openide.util.Lookup;
import org.netbeans.modules.versioning.spi.testvcs.TestVCSInterceptor;

/**
 * Versioning SPI unit tests of VCSInterceptor.

        assertTrue(provider.revisionprovided);
    }
    
    public void testHistoryEntryProvidesParent() throws IOException {
        ParentProviderImpl provider = new ParentProviderImpl();
        VCSHistoryProvider.HistoryEntry h =
                new VCSHistoryProvider.HistoryEntry(
                new File[] {new File("")},
                new Date(System.currentTimeMillis()),
                "msg",
                "user",
                "username",
                "12345",
                "1234567890",
                new Action[0],
                null,
                null,
                provider);
        
        h = h.getParentEntry();
        assertNotNull(h);
        assertEquals(ParentProviderImpl.PARENT_MSG, h.getMessage());
    }

    public void testHistoryGetRevisionIsReallyInvoked() throws IOException {
        File f = new File(dataRootDir, "workdir/root-test-versioned/" + TestVCSHistoryProvider.FILE_PROVIDES_REVISIONS_SUFFIX);
        f.createNewFile();

        assertTrue(TestVCSHistoryProvider.instance.revisionProvided);
    }
    
    public void testHistoryGetParentIsReallyInvoked() throws IOException {
        File f = new File(dataRootDir, "workdir/root-test-versioned/" + TestVCSHistoryProvider.FILE_PROVIDES_REVISIONS_SUFFIX);
        f.createNewFile();
        VersioningSystem vs = VersioningSupport.getOwner(f);
        assertNotNull(vs);
        VCSHistoryProvider hp = vs.getVCSHistoryProvider();
        assertNotNull(hp);
        
        HistoryEntry[] history = hp.getHistory(new File[] {f}, null);
        assertNotNull(history);
        assertTrue(history.length > 0);
        HistoryEntry parentEntry = history[0].getParentEntry();
        assertNotNull(parentEntry);
        assertEquals(TestVCSHistoryProvider.PARENT_MSG, parentEntry.getMessage());
        
        // the same test again just to see that VCSSystemProvider.VersioningSystem properly delegates
        VCSFileProxy proxy = VCSFileProxy.createFileProxy(f);
        VCSSystemProvider.VersioningSystem pvs = Utils.getOwner(proxy);
        assertNotNull(pvs);
        org.netbeans.modules.versioning.core.spi.VCSHistoryProvider php = pvs.getVCSHistoryProvider();
        assertNotNull(php);

        org.netbeans.modules.versioning.core.spi.VCSHistoryProvider.HistoryEntry[] phistory = php.getHistory(new VCSFileProxy[] {proxy}, null);
        assertNotNull(phistory);
        assertTrue(phistory.length > 0);
        org.netbeans.modules.versioning.core.spi.VCSHistoryProvider.HistoryEntry proxyParentEntry = phistory[0].getParentEntry();
        assertEquals(TestVCSHistoryProvider.PARENT_MSG, proxyParentEntry.getMessage());
    }

    public void testHistoryEntryDoesntProvideRevision() throws IOException {
        RevisionProviderImpl provider = new RevisionProviderImpl();
        provider.revisionprovided = false;

        // nothing happend
    }
    
    public void testHistoryEntryDoesntProvideParent() throws IOException {
        RevisionProviderImpl provider = new RevisionProviderImpl();
        provider.revisionprovided = false;
        VCSHistoryProvider.HistoryEntry h = 
                new VCSHistoryProvider.HistoryEntry(
                    new File[] {new File("")}, 
                    new Date(System.currentTimeMillis()), 
                    "msg", 
                    "user", 
                    "username", 
                    "12345", 
                    "1234567890", 
                    new Action[0], 
                    null);
        h.getParentEntry();
        // nothing happend
    }
    
    public void testHistoryEntryEditable() throws IOException {
        MessageEditProviderImpl provider = new MessageEditProviderImpl();
        provider.message = null;

        }
    }
    
    private class ParentProviderImpl implements VCSHistoryProvider.ParentProvider {
        static final String PARENT_MSG = "im.the.parent";
        private VCSHistoryProvider.HistoryEntry he = 
                new VCSHistoryProvider.HistoryEntry(
                    new File[] {new File("")}, 
                    new Date(System.currentTimeMillis()), 
                    PARENT_MSG, 
                    "user", 
                    "username", 
                    "12345", 
                    "1234567890", 
                    new Action[0], 
                    null,
                    null);
        @Override
        public HistoryEntry getParentEntry() {
            return he;
        }
    }
    
    private class MessageEditProviderImpl implements VCSHistoryProvider.MessageEditProvider {
        String message;
        @Override

Lines 52-62 Link Here

(-)versioning/test/unit/src/org/netbeans/modules/versioning/spi/testvcs/TestVCSHistoryProvider.java (-1 / +22 lines)
52	*	52	*
53	* @author tomas	53	* @author tomas
54	*/	54	*/
55	public class TestVCSHistoryProvider implements VCSHistoryProvider, VCSHistoryProvider.RevisionProvider {	55	public class TestVCSHistoryProvider implements VCSHistoryProvider, VCSHistoryProvider.RevisionProvider, VCSHistoryProvider.ParentProvider {
56	public static final String FILE_PROVIDES_REVISIONS_SUFFIX = "providesRevisions";	56	public static final String FILE_PROVIDES_REVISIONS_SUFFIX = "providesRevisions";
57	public static TestVCSHistoryProvider instance;	57	public static TestVCSHistoryProvider instance;
58		58
		59	public static String PARENT_MSG = "im.the.parent";
		60
59	public boolean revisionProvided = false;	61	public boolean revisionProvided = false;
		62	public boolean parentrevisionProvided = false;
60	public static HistoryEntry[] history;	63	public static HistoryEntry[] history;
61		64
62	public TestVCSHistoryProvider() {	65	public TestVCSHistoryProvider() {
Lines 83-88 Link Here
83	"12345",	86	"12345",
84	"1234567890",	87	"1234567890",
85	new Action[0],	88	new Action[0],
		89	this,
		90	null,
86	this)};	91	this)};
87		92
88	}	93	}
Lines 114-117 Link Here
114	public void getRevisionFile(File originalFile, File revisionFile) {	119	public void getRevisionFile(File originalFile, File revisionFile) {
115	revisionProvided = true;	120	revisionProvided = true;
116	}	121	}
		122
		123	@Override
		124	public HistoryEntry getParentEntry() {
		125	return new VCSHistoryProvider.HistoryEntry(
		126	new File[] {new File("")},
		127	new Date(System.currentTimeMillis()),
		128	PARENT_MSG,
		129	"user",
		130	"username",
		131	"12345",
		132	"1234567890",
		133	new Action[0],
		134	this);
117	}	135	}
		136
		137
		138	}

Return to bug 209673

Lines 580-587 Link Here

(-)versioning/src/org/netbeans/modules/versioning/DelegatingVCS.java (-19 / +45 lines)
580	HistoryEntry[] proxyHistory = new HistoryEntry[history.length];	580	HistoryEntry[] proxyHistory = new HistoryEntry[history.length];
581	for (int i = 0; i < proxyHistory.length; i++) {	581	for (int i = 0; i < proxyHistory.length; i++) {
582	final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he = history[i];	582	final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he = history[i];
583	RevisionProvider rp = new RevisionProvider() {	583	proxyHistory[i] = delegateHistoryEntry(proxies, he);
		584	}
		585	return proxyHistory;
		586	}
		587
584	@Override	588	@Override
		589	public Action createShowHistoryAction(VCSFileProxy[] proxies) {
		590	File[] files = toFiles(proxies);
		591	return getDelegate().getVCSHistoryProvider().createShowHistoryAction(files);
		592	}
		593
		594	private MessageEditProvider delegateMessageEditProvider(final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he) {
		595	if(he.canEdit()) {
		596	return new MessageEditProvider() {
		597	@Override
		598	public void setMessage(String message) throws IOException {
		599	org.netbeans.modules.versioning.spi.VCSHistoryProvider.MessageEditProvider provider = Accessor.IMPL.getMessageEditProvider(he);
		600	if(provider != null) {
		601	provider.setMessage(message);
		602	}
		603	}
		604	};
		605	}
		606	return null;
		607	}
		608
		609	private RevisionProvider delegateRevisionProvider(final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he) {
		610	return new RevisionProvider() {
		611	@Override
585	public void getRevisionFile(VCSFileProxy originalFile, VCSFileProxy revisionFile) {	612	public void getRevisionFile(VCSFileProxy originalFile, VCSFileProxy revisionFile) {
586	org.netbeans.modules.versioning.spi.VCSHistoryProvider.RevisionProvider provider = Accessor.IMPL.getRevisionProvider(he);	613	org.netbeans.modules.versioning.spi.VCSHistoryProvider.RevisionProvider provider = Accessor.IMPL.getRevisionProvider(he);
587	if(provider != null) {	614	if(provider != null) {
Lines 593-612 Link Here
593	}	620	}
594	}	621	}
595	};	622	};
596	MessageEditProvider mep = null;	623	}
597	if(he.canEdit()) {	624
598	mep = new MessageEditProvider() {	625	private ParentProvider delegateParentProvider(final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he) {
		626	return new ParentProvider() {
599	@Override	627	@Override
600	public void setMessage(String message) throws IOException {	628	public HistoryEntry getParentEntry() {
601	org.netbeans.modules.versioning.spi.VCSHistoryProvider.MessageEditProvider provider = Accessor.IMPL.getMessageEditProvider(he);	629	org.netbeans.modules.versioning.spi.VCSHistoryProvider.ParentProvider provider = Accessor.IMPL.getParentProvider(he);
602	if(provider != null) {	630	if(provider != null) {
603	provider.setMessage(message);	631	org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he = provider.getParentEntry();
		632	if(he != null) {
		633	return delegateHistoryEntry(toProxies(he.getFiles()), he);
604	}	634	}
605	}	635	}
		636	return null;
		637	}
606	};	638	};
607	}	639	}
608	proxyHistory[i] =	640
609	new HistoryEntry(	641	private HistoryEntry delegateHistoryEntry(VCSFileProxy[] proxies, final org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryEntry he) {
		642	return new HistoryEntry(
610	proxies,	643	proxies,
611	he.getDateTime(),	644	he.getDateTime(),
612	he.getMessage(),	645	he.getMessage(),
Lines 615-632 Link Here
615	he.getRevision(),	648	he.getRevision(),
616	he.getRevisionShort(),	649	he.getRevisionShort(),
617	he.getActions(),	650	he.getActions(),
618	rp,	651	delegateRevisionProvider(he),
619	mep);	652	delegateMessageEditProvider(he),
		653	delegateParentProvider(he));
620	}	654	}
621	return proxyHistory;
622	}
623		655
624	@Override
625	public Action createShowHistoryAction(VCSFileProxy[] proxies) {
626	File[] files = toFiles(proxies);
627	return getDelegate().getVCSHistoryProvider().createShowHistoryAction(files);
628	}
629
630	private class DelegateChangeListener implements org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryChangeListener {	656	private class DelegateChangeListener implements org.netbeans.modules.versioning.spi.VCSHistoryProvider.HistoryChangeListener {
631	private final VCSHistoryProvider.HistoryChangeListener delegate;	657	private final VCSHistoryProvider.HistoryChangeListener delegate;
632	public DelegateChangeListener(HistoryChangeListener delegate) {	658	public DelegateChangeListener(HistoryChangeListener delegate) {

Lines 123-128 Link Here

(-)versioning/src/org/netbeans/modules/versioning/spi/VCSHistoryProvider.java (+75 lines)
123	private Action[] actions;	123	private Action[] actions;
124	private RevisionProvider revisionProvider;	124	private RevisionProvider revisionProvider;
125	private MessageEditProvider messageEditProvider;	125	private MessageEditProvider messageEditProvider;
		126	private ParentProvider parentProvider;
126		127
127	/**	128	/**
128	* Creates a new HistoryEntry instance.	129	* Creates a new HistoryEntry instance.
Lines 198-203 Link Here
198	}	199	}
199		200
200	/**	201	/**
		202	* Creates a new HistoryEntry instance.
		203	*
		204	* @param files involved files
		205	* @param dateTime the date and time when the versioning revision was created
		206	* @param message the message describing the versioning revision
		207	* @param username full description of the user who created the versioning revision
		208	* @param usernameShort short description of the user who created the versioning revision
		209	* @param revision full description of the versioning revision
		210	* @param revisionShort short description of the versioning revision
		211	* @param actions actions which might be called in regard with this revision
		212	* @param revisionProvider a RevisionProvider to get access to a files contents in this revision
		213	* @param messageEditProvider a MessageEditProvider to change a revisions message
		214	* @param parentProvider a ParentProvider to provide this entries parent entry. Not necessary for VCS
		215	* where a revisions parent always is the time nearest previous revision.
		216	*
		217	* @since 1.30
		218	*/
		219	public HistoryEntry(
		220	File[] files,
		221	Date dateTime,
		222	String message,
		223	String username,
		224	String usernameShort,
		225	String revision,
		226	String revisionShort,
		227	Action[] actions,
		228	RevisionProvider revisionProvider,
		229	MessageEditProvider messageEditProvider,
		230	ParentProvider parentProvider)
		231	{
		232	this(files, dateTime, message, username, usernameShort, revision, revisionShort, actions, revisionProvider, messageEditProvider);
		233	this.parentProvider = parentProvider;
		234	}
		235
		236	/**
201	* Determines if this HistoryEntry instance supports changes.	237	* Determines if this HistoryEntry instance supports changes.
202	*	238	*
203	* @return true if it is possible to access setter methods in this instance	239	* @return true if it is possible to access setter methods in this instance
Lines 332-337 Link Here
332	}	368	}
333		369
334	/**	370	/**
		371	* Returns this revisions parent entry or null if not available.
		372	*
		373	* @return this revisions parent entry
		374	*
		375	* @since 1.30
		376	*/
		377	public HistoryEntry getParentEntry() {
		378	if(parentProvider != null) {
		379	return parentProvider.getParentEntry();
		380	}
		381	return null;
		382	}
		383
		384	/**
335	* Returns the RevisionProvider	385	* Returns the RevisionProvider
336	* @return the RevisionProvider	386	* @return the RevisionProvider
337	*/	387	*/
Lines 346-352 Link Here
346	MessageEditProvider getMessageEditProvider() {	396	MessageEditProvider getMessageEditProvider() {
347	return messageEditProvider;	397	return messageEditProvider;
348	}	398	}
		399
		400	/**
		401	* Returns the ParentProvider or null
		402	* @return the ParentProvider
		403	*/
		404	ParentProvider getParentProvider() {
		405	return parentProvider;
349	}	406	}
		407	}
350		408
351	/**	409	/**
352	* Adds a listener for history change events.	410	* Adds a listener for history change events.
Lines 393-398 Link Here
393	}	451	}
394		452
395	/**	453	/**
		454	* Implement and pass over to a {@link HistoryEntry} in case you want
		455	* {@link HistoryEntry#getParentProvider()} to return relevant values.
		456	*
		457	* @since 1.30
		458	*/
		459	public interface ParentProvider {
		460	/**
		461	* Return a {@link HistoryEntry} representing the parent of the {@link HistoryEntry}
		462	* configured with this ParentProvider.
		463	*
		464	* @return the parent HistoryEntry
		465	* @since 1.30
		466	*/
		467	HistoryEntry getParentEntry();
		468	}
		469
		470	/**
396	* Implement and pass over to {@link HistoryEntry} in case	471	* Implement and pass over to {@link HistoryEntry} in case
397	* {@link HistoryEntry#setMessage(java.lang.String)}	472	* {@link HistoryEntry#setMessage(java.lang.String)}
398	* is expected to work.	473	* is expected to work.

Lines 111-116 Link Here

(-)versioning/apichanges.xml (+14 lines)
111		111
112	<change>	112	<change>
113	<api name="versioning_spi"/>	113	<api name="versioning_spi"/>
		114	<summary>Added VCSHistoryProvider.HistoryEntry.getParent()</summary>
		115	<version major="1" minor="30"/>
		116	<date day="23" month="3" year="2012"/>
		117	<author login="tstupka"/>
		118	<compatibility addition="yes"/>
		119	<description>
		120	New method <code>VCSHistoryProvider.HistoryEntry.getParent()</code> to provide the
		121	<code>VCSHistoryProvider.HistoryEntry</code> representing the parent of the given revision.
		122	</description>
		123	<class package="org.netbeans.modules.versioning.spi" name="VersioningSupport"/>
		124	<issue number="209673"/>
		125	</change>
		126	<change>
		127	<api name="versioning_spi"/>
114	<summary>Added VCSHistoryProvider</summary>	128	<summary>Added VCSHistoryProvider</summary>
115	<version major="1" minor="29"/>	129	<version major="1" minor="29"/>
116	<date day="30" month="1" year="2012"/>	130	<date day="30" month="1" year="2012"/>