Skip to content

Gh362 comment icon propagation - #445

Open
elena-posea wants to merge 20 commits into
masterfrom
GH362-comment-icon-propagation
Open

Gh362 comment icon propagation#445
elena-posea wants to merge 20 commits into
masterfrom
GH362-comment-icon-propagation

Conversation

@elena-posea

Copy link
Copy Markdown
Contributor

propagation for flags and icons (both for comments and sync), using common logic + test classes for both

work on using DirtyPropagationController for sync
GH362-comment-icon-propagation

Conflicts:
	org.flowerplatform.codesync.sdiff/src/org/flowerplatform/codesync/sdiff/CodeSyncSdiffPlugin.java
Conflicts:
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/controller/GitPropertiesProvider.java
	org.flowerplatform.tests/META-INF/MANIFEST.MF
GH362-comment-icon-propagation

Conflicts:
	org.flowerplatform.codesync.sdiff/src/org/flowerplatform/codesync/sdiff/CodeSyncSdiffPlugin.java
GH362-comment-icon-propagation

Conflicts:
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/CodeSyncRemoveNodeController.java
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/controller/CodeSyncPropertySetter.java

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use same instance

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DONE

@mariana-gheorghe

Copy link
Copy Markdown
Contributor

There are many files that appear modified. I suspect it's a line separator issue, check your Eclipse prefs

GH362-comment-icon-propagation

Conflicts:
	org.flowerplatform.codesync.regex/META-INF/MANIFEST.MF
	org.flowerplatform.codesync.sdiff/src/org/flowerplatform/codesync/sdiff/CodeSyncSdiffConstants.java
	org.flowerplatform.codesync.sdiff/src/org/flowerplatform/codesync/sdiff/CodeSyncSdiffPlugin.java
	org.flowerplatform.flex_client.codesync.regex/META-INF/MANIFEST.MF
	org.flowerplatform.flex_client.mindmap/src/org/flowerplatform/flex_client/mindmap/MindMapEditorDiagramShell.as
	org.flowerplatform.util/META-INF/MANIFEST.MF
	org.flowerplatform.util/src/org/flowerplatform/util/regex/RegexConfiguration.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants