Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Structured Programming #156

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Structured Programming #156

wants to merge 16 commits into from

Conversation

FelixJoehnk
Copy link

@FelixJoehnk
Problems with import on StructuredEditMsg
92222f3
@FelixJoehnk
Working with all properties on all nodes, regions and edges
0aba541
@FelixJoehnk
Working with properties on all nodes regions and edges
71787af
@FelixJoehnk
Working Text change with delete but text is not transmitted to client…
123ef57 
… again (@accessors KGraphLanguageClient client is null)
@FelixJoehnk
Changed Semantics to Options on root node and thus needed a few chang…
a8531cf 
…es to all actions aswell as the sendable options
@FelixJoehnk
More Actions like Aborting actions etc.
0fdf06a 
Also generates the correct text file as output but client is still null and thus transmittion is not possible!
@FelixJoehnk
Language Server ext. with client now working
e557711
@FelixJoehnk
wisiwig user story for target selection
616f01e
@FelixJoehnk
mka code review first change
7e8beb9 
# Conflicts:
#	plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/util/KlighdProperties.java
@FelixJoehnk
add basic semantic structure to create semantic filters
e5d7b94
@FelixJoehnk
Changed the Structured Options so that its based on Tags.
24f954c 
Also added some more Actions
@FelixJoehnk
Added Priority Change Action
7e21fa1 
Added support for trigger and effect creation
@FelixJoehnk
Added Comments and code formating.
b50d9d9
@FelixJoehnk
Added a property to display to the client if the context menu is enab…
c81b1b2 
…led or disabled
soerendomroes
soerendomroes requested changes Apr 4, 2023
View reviewed changes
Copy link
Member

@soerendomroes soerendomroes left a comment

Choose a reason for hiding this comment

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

klighd.lsp cannot depend on SCCharts. Try using a service interface instead.

plugins/de.cau.cs.kieler.klighd.lsp/.project
@@ -6,12 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
Copy link
Member

Choose a reason for hiding this comment

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

Why is this changed?

plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend Outdated
@Inject

@Inject
protected ScchartStructuredProgrammingActionHandler scchartsStructuredActionHandler
Copy link
Member

Choose a reason for hiding this comment

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

Is this the only change and the rest are just write-space changes?
The name suggests that it should not be in here since it sounds SCCharts-specific, maybe you should use a service interface for this.
If you use SCCharts in a class name, also capitalize it the same way as SCCharts.

plugins/de.cau.cs.kieler.klighd.lsp/META-INF/MANIFEST.MF
@@ -35,4 +36,5 @@ Require-Bundle: de.cau.cs.kieler.kgraph.text,
org.eclipse.lsp4j.jsonrpc;bundle-version="0.8.0",
org.eclipse.sprotty;bundle-version="0.7.0",
org.eclipse.xtext.ide;bundle-version="2.21.0",
org.eclipse.xtext.xbase;bundle-version="2.21.0"
org.eclipse.xtext.xbase;bundle-version="2.21.0",
de.cau.cs.kieler.sccharts;bundle-version="1.4.0"
Copy link
Member

Choose a reason for hiding this comment

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

klighd.lsp cannot and should never have an SCCharts dependency.

plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/LSPUtil.xtend
* SPDX-License-Identifier: EPL-2.0
*/
package de.cau.cs.kieler.klighd.lsp

import com.google.common.html.HtmlEscapers
import de.cau.cs.kieler.klighd.ViewContext
import de.cau.cs.kieler.klighd.kgraph.KNode
import de.cau.cs.kieler.klighd.kgraph.KEdge
import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties
import de.cau.cs.kieler.sccharts.State
Copy link
Member

Choose a reason for hiding this comment

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

Again, no SCCharts dependencies in here.

plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/LSPUtil.xtend
import de.cau.cs.kieler.klighd.kgraph.KEdge
import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties
import de.cau.cs.kieler.sccharts.State
import de.cau.cs.kieler.kexpressions.impl.ValuedObjectImpl
Copy link
Member

Choose a reason for hiding this comment

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

Also no kexpressions dependencies.

...klighd/lsp/structuredProgramming/sccharts/StructuredProgScchartLanguageServerExtension.xtend Outdated
*
* http://rtsys.informatik.uni-kiel.de/kieler
*
* Copyright ${year} by
Copy link
Member

Choose a reason for hiding this comment

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

Year missing.

...klighd/lsp/structuredProgramming/sccharts/StructuredProgScchartLanguageServerExtension.xtend Outdated
}

/*Method to add hirarchical behavior to a node */
def addHirachicalNode(AddHierarchicalStateAction action, String clientId, KGraphDiagramServer server) {
Copy link
Member

Choose a reason for hiding this comment

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

Hierarchical

...klighd/lsp/structuredProgramming/sccharts/StructuredProgScchartLanguageServerExtension.xtend Outdated
factory = new SCChartsFactoryImpl()
}

/*simply sets the range to be the files size. */
Copy link
Member

Choose a reason for hiding this comment

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

All the methods below do not have a javadoc but only a comment in front of them.

plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF
@@ -21,6 +21,7 @@ Bundle-ActivationPolicy: lazy
Bundle-Activator: de.cau.cs.kieler.klighd.KlighdPlugin
Export-Package: de.cau.cs.kieler.klighd,
de.cau.cs.kieler.klighd.actions,
de.cau.cs.kieler.klighd.filtering,
Copy link
Member

Choose a reason for hiding this comment

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

These are the changes by mka, correct?

...de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/structuredEditMsg/StructuredEditMsg.java
/**
* This class holds the keyinformation what inputs need to be done on the client for a specific
* action. The label is displayed to the user in the contextmenu. The kind is the action kind.
* Mergable is when multiple things are selected and it can be done for all of them The InputType
Copy link
Member

Choose a reason for hiding this comment

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

them. The InputType

@soerendomroes soerendomroes mentioned this pull request May 3, 2023
Open
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soerendomroes soerendomroes soerendomroes requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FelixJoehnk @soerendomroes